diff --git a/plugins/content_types/node_context/node_comment_form.inc b/plugins/content_types/node_context/node_comment_form.inc
index f77b66e..85a3f82 100644
--- a/plugins/content_types/node_context/node_comment_form.inc
+++ b/plugins/content_types/node_context/node_comment_form.inc
@@ -20,7 +20,6 @@ function ctools_node_comment_form_content_type_render($subtype, $conf, $panel_ar
   $node = isset($context->data) ? clone($context->data) : NULL;
   $block = new stdClass();
   $block->module = 'comments';
-  $block->delta  = $node->nid;
 
   $block->title = t('Add comment');
 
@@ -28,6 +27,7 @@ function ctools_node_comment_form_content_type_render($subtype, $conf, $panel_ar
     $block->content = t('Comment form here.');
   }
   else if ($node->comment == COMMENT_NODE_OPEN) {
+    $block->delta  = $node->nid;
     if (user_access('post comments')) {
       $comment = new stdClass();
       $comment->nid = $node->nid;
diff --git a/plugins/content_types/node_context/node_comments.inc b/plugins/content_types/node_context/node_comments.inc
index 0f0033d..4f50464 100644
--- a/plugins/content_types/node_context/node_comments.inc
+++ b/plugins/content_types/node_context/node_comments.inc
@@ -23,16 +23,23 @@ function ctools_node_comments_content_type_render($subtype, $conf, $panel_args,
   $node = isset($context->data) ? clone($context->data) : NULL;
   $block = new stdClass();
   $block->module = 'comments';
-  $block->delta  = $node->nid;
 
-  $block->title = t('Comments');
-  if (empty($node)) {
-    $block->content = t('Node comments go here.');
+  // Do nothing if $node is missing.
+  if (is_null($node)) {
+    $block = NULL;
   }
-  else if ($node->comment) {
-    $block->content = ctools_comment_render($node, $conf);
-    // Update the history table, stating that this user viewed this node.
-    node_tag_new($node);
+  else {
+    $block->delta  = $node->nid;
+
+    $block->title = t('Comments');
+    if (empty($node)) {
+      $block->content = t('Node comments go here.');
+    }
+    else if ($node->comment) {
+      $block->content = ctools_comment_render($node, $conf);
+      // Update the history table, stating that this user viewed this node.
+      node_tag_new($node);
+    }
   }
 
   return $block;