diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php
index 578861b0..846e90ce 100644
--- a/PHPCI/Controller/ProjectController.php
+++ b/PHPCI/Controller/ProjectController.php
@@ -166,9 +166,9 @@ class ProjectController extends \PHPCI\Controller
             $sshKey = new SshKey();
             $key = $sshKey->generate();
 
-            $values['key']    = $key ? $key['private_key'] : '';
-            $values['pubkey'] = $key ? $key['public_key'] : '';
-            $pub              = $key ? $key['public_key'] : '';
+            $values['key']    = isset($key['private_key']) ? $key['private_key'] : '';
+            $values['pubkey'] = isset($key['public_key'])  ? $key['public_key']  : '';
+            $pub              = isset($key['public_key'])  ? $key['public_key']  : '';
         }
 
         $form = $this->projectForm($values);
diff --git a/PHPCI/Helper/SshKey.php b/PHPCI/Helper/SshKey.php
index 77c4a64a..4c625ff4 100644
--- a/PHPCI/Helper/SshKey.php
+++ b/PHPCI/Helper/SshKey.php
@@ -45,7 +45,7 @@ class SshKey
 
     public function canGenerateKeys()
     {
-        $keygen = @shell_exec('ssh-keygen');
+        $keygen = @shell_exec('ssh-keygen -h');
         $canGenerateKeys = !empty($keygen);
 
         return $canGenerateKeys;