2 files changed, 2 insertions, 2 deletions
diff --git a/core/helpers/core_block.php b/core/helpers/core_block.php
index abaa9205..7f756b92 100644
--- a/core/helpers/core_block.php
+++ b/core/helpers/core_block.php
@@ -25,7 +25,7 @@ class core_block_Core {
       $profiler->render();
     }
 
-    if (access::can("edit", $theme->item())) {
+    if ($theme->item() && access::can("edit", $theme->item())) {
       return new View("in_place_edit.html");
     }
   }
diff --git a/core/helpers/core_menu.php b/core/helpers/core_menu.php
index daf27ac1..c375e8b1 100644
--- a/core/helpers/core_menu.php
+++ b/core/helpers/core_menu.php
@@ -40,7 +40,7 @@ class core_menu_Core {
       $menu->append($admin_menu);
     }
 
-    if (access::can("edit", $item)) {
+    if ($item && access::can("edit", $item)) {
       $menu->append(
         Menu::factory("submenu")
         ->id("options_menu")