diff --git a/context.module b/context.module
index 613cf98..7938ede 100644
--- a/context.module
+++ b/context.module
@@ -532,7 +532,7 @@ function _context_registry($key = NULL, $reset = FALSE) {
  * not dropped
  */
 function context_block_view_alter(&$data, $block) {
-  if (context_isset('context_ui', 'context_ui_editor_present') && empty($data['content'])) {
+  if (context_isset('context_ui', 'context_ui_editor_present') && (empty($data['content']) || empty($data['content']['#markup'])))  {
     $data['content']['#markup'] = "<div class='context-block-empty'>" . t('This block appears empty when displayed on this page.') . "</div>";
   }
 }