diff --git a/ds.registry.inc b/ds.registry.inc
index 77cbd76..292cefd 100644
--- a/ds.registry.inc
+++ b/ds.registry.inc
@@ -185,6 +185,14 @@ function _ds_entity_info_alter(&$entity_info) {
       continue;
     }
 
+    if (!isset($entity_info[$row->entity_type])) {
+      continue;
+    }
+
+    if (!isset($entity_info[$row->entity_type]['bundles'][$row->bundle])) {
+      continue;
+    }
+
     $layout = array();
     if (!isset($row->settings['ds_panels'])) {
       $layout = $ds_layouts[$row->layout];