diff --git a/plugins/entity/PanelizerEntityDefault.class.php b/plugins/entity/PanelizerEntityDefault.class.php
index 797b35e..33885e3 100644
--- a/plugins/entity/PanelizerEntityDefault.class.php
+++ b/plugins/entity/PanelizerEntityDefault.class.php
@@ -1110,11 +1110,13 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
       foreach ($this->plugin['view modes'] as $view_mode => $view_mode_info) {
         if (isset($form_state['values']['panelizer'][$view_mode]['name'])) {
           $entity->panelizer[$view_mode] = $this->get_default_panelizer_object($bundle . '.' . $view_mode, $form_state['values']['panelizer'][$view_mode]['name']);
-          $entity->panelizer[$view_mode]->did = NULL;
+          if (!empty($entity->panelizer[$view_mode])) {
+            $entity->panelizer[$view_mode]->did = NULL;
 
-          // Ensure original values are maintained:
-          $entity->panelizer[$view_mode]->entity_id = $form['panelizer'][$view_mode]['name']['#entity_id'];
-          $entity->panelizer[$view_mode]->revision_id = $form['panelizer'][$view_mode]['name']['#revision_id'];
+            // Ensure original values are maintained:
+            $entity->panelizer[$view_mode]->entity_id = $form['panelizer'][$view_mode]['name']['#entity_id'];
+            $entity->panelizer[$view_mode]->revision_id = $form['panelizer'][$view_mode]['name']['#revision_id'];
+          }
         }
       }
     }