From a796a680f9e4c6f2f7f2042e0e2752ec9dac3f86 Mon Sep 17 00:00:00 2001
From: Lev Tsypin <lev@thinkshout.com>
Date: Wed, 16 Oct 2013 13:05:32 -0700
Subject:  Lev Tsypin: Generated with Drush iq

---
 entity.module | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/entity.module b/entity.module
index 9c8d5a9..ace10b5 100644
--- a/entity.module
+++ b/entity.module
@@ -185,22 +185,23 @@ function entity_ui_entity_page_view($entity) {
  */
 function entity_ui_get_page_title($op, $entity_type, $entity = NULL) {
   module_load_include('inc', 'entity', 'includes/entity.ui');
-  $label = entity_label($entity_type, $entity);
-  switch ($op) {
-    case 'view':
-      return $label;
-    case 'edit':
-      return t('Edit @label', array('@label' => $label));
-    case 'clone':
-      return t('Clone @label', array('@label' => $label));
-    case 'revert':
-      return t('Revert @label', array('@label' => $label));
-    case 'delete':
-      return t('Delete @label', array('@label' => $label));
-    case 'export':
-      return t('Export @label', array('@label' => $label));
-  }
+  $bundle = NULL;
   if (isset($entity)) {
+    $label = entity_label($entity_type, $entity);
+    switch ($op) {
+      case 'view':
+        return $label;
+      case 'edit':
+        return t('Edit @label', array('@label' => $label));
+      case 'clone':
+        return t('Clone @label', array('@label' => $label));
+      case 'revert':
+        return t('Revert @label', array('@label' => $label));
+      case 'delete':
+        return t('Delete @label', array('@label' => $label));
+      case 'export':
+        return t('Export @label', array('@label' => $label));
+    }
     list(, , $bundle) = entity_extract_ids($entity_type, $entity);
   }
   return entity_ui_get_action_title($op, $entity_type, $bundle);
--
1.8.4