diff --git a/provision_civicrm.drush.inc b/provision_civicrm.drush.inc
index 5aea2c0..86f2194 100644
--- a/provision_civicrm.drush.inc
+++ b/provision_civicrm.drush.inc
@@ -203,9 +203,17 @@ function _provision_civicrm_is_site_context($op = 'unkown') {
     // Note: after putting the code there, you need to verify
     // the platform.
     $packages = drush_get_option('packages', array('modules' => NULL));
-    $modules = $packages['modules'];
-    if (is_array($modules) && array_key_exists('civicrm', $modules)) {
-      return TRUE;
+
+    // TODO: Untangle this mess
+    if (in_array('modules', $packages)) {
+      $modules = $packages['modules'];
+
+      if (is_array($modules) && array_key_exists('civicrm', $modules)) {
+        return TRUE;
+      }
+      else {
+        return FALSE;
+      }
     }
     else {
       return FALSE;