diff --git a/Provision/Context.php b/Provision/Context.php
index 228098ffc80a318f2aa5af47895cb39d056a4253..7e74764d8459669f074dc99dd05f494410917e76 100644
--- a/Provision/Context.php
+++ b/Provision/Context.php
@@ -70,8 +70,10 @@ class Provision_Context {
 
     // If $this->name refers to a basic drush alias (not an aegir managed site),
     // and the property exists in drush alias, return it.
-    elseif ($drush_alias = provision_sitealias_get_record($this->name)) { //&& isset($drush_alias[$name])) {
-      return $drush_alias[$name];
+    elseif ($drush_alias = provision_sitealias_get_record($this->name)) {
+      if (isset($drush_alias[$name])) {
+        return $drush_alias[$name];
+      }
     }
   }