--- conditional_fields.module
+++ conditional_fields.module
@@ -1045,7 +1045,9 @@ function conditional_fields_load_dependencies($entity_type = NULL, $bundle = NUL
   }
 
   if (!isset($dependencies[$entity_type][$bundle])) {
-    $dependencies[$entity_type][$bundle] = array();
+    if(!is_null($entity_type) && !is_null($bundle)){
+      $dependencies[$entity_type][$bundle] = array();
+    }
     $default_options = conditional_fields_dependency_default_options();
 
     $select = db_select('conditional_fields', 'cf')
--- includes/conditional_fields.features.inc
+++ includes/conditional_fields.features.inc
@@ -48,16 +48,17 @@ function conditional_fields_features_export_render($module_name = '', $data) {
 
     if (isset($dependencies[$entity]) && isset($dependencies[$entity][$bundle])) {
       $info = $dependencies[$entity][$bundle];
-      foreach ($info as $k => $v) {
-        if (isset($v['dependees'])) {
+      foreach ($info['dependents'] as $dependent_field_name => $dependees) {
+        foreach ($dependees as $dependee) {
+
           $code[] = '  $items[] = array(';
           $code[] = "    'entity' => '" . $entity . "',";
           $code[] = "    'bundle' => '" . $bundle . "',";
-          $code[] = "    'dependent' => '" . $k . "',";
-          $dependee = array_keys($v['dependees']);
-          $code[] = "    'dependee' => '" . $dependee[0] . "',";
+          $code[] = "    'dependent' => '" . $dependent_field_name . "',";
+          $code[] = "    'dependee' => '" . $dependee['dependee'] . "',";
+
           $code[] = "    'options' => ";
-          $vals = explode("\n", var_export($v['dependees'][$dependee[0]]['options'], TRUE));
+          $vals = explode("\n", var_export($dependee['options'], TRUE));
           // $code += $vals would work just as well here, but this formats the output nicer.
           foreach ($vals as $val) {
             $code[] = '      ' . $val;