diff --git a/eck.classes.inc b/eck.classes.inc
index a1171ef..9714c1f 100644
--- a/eck.classes.inc
+++ b/eck.classes.inc
@@ -374,7 +374,7 @@ class Bundle extends DBObject{
       //@todo we just need to change the field in the db to be unique
       if($this->is_new){
         $bundle = Bundle::loadByMachineName($this->machine_name);
-        if(!$bundle->is_new){
+        if(!empty($bundle) && !$bundle->is_new){
           $save = FALSE;
         }
       }
diff --git a/eck.features.inc b/eck.features.inc
index 475cbf7..4bb47f6 100644
--- a/eck.features.inc
+++ b/eck.features.inc
@@ -210,6 +210,7 @@ function eck_bundle_features_export_render($module, $data, $export = NULL) {
     'entity_type' => NULL,
     'name' => NULL,
     'label' => NULL,
+    'config' => NULL,
   );
   $output =  array();
   $output[] = '  $items = array(';