diff --git a/plugins/content_types/node_context/node_comment_form.inc b/plugins/content_types/node_context/node_comment_form.inc
index f77b66e..4b35eaf 100644
--- a/plugins/content_types/node_context/node_comment_form.inc
+++ b/plugins/content_types/node_context/node_comment_form.inc
@@ -17,34 +17,37 @@ if (module_exists('comment')) {
 }
 
 function ctools_node_comment_form_content_type_render($subtype, $conf, $panel_args, $context) {
-  $node = isset($context->data) ? clone($context->data) : NULL;
   $block = new stdClass();
   $block->module = 'comments';
-  $block->delta  = $node->nid;
-
   $block->title = t('Add comment');
 
-  if (empty($node)) {
+  if (empty($context->data)) {
+    $block->delta = NULL;
     $block->content = t('Comment form here.');
   }
-  else if ($node->comment == COMMENT_NODE_OPEN) {
-    if (user_access('post comments')) {
-      $comment = new stdClass();
-      $comment->nid = $node->nid;
-      $comment->pid = NULL;
-      $form_state = array(
-        'ctools comment alter' => TRUE,
-        'node' => $node,
-        'build_info' => array(
-          'args' => array(
-            $comment,
+  else {
+    $node = clone($context->data);
+    $block->delta = $node->nid;
+
+    if ($node->comment == COMMENT_NODE_OPEN) {
+      if (user_access('post comments')) {
+        $comment = new stdClass();
+        $comment->nid = $node->nid;
+        $comment->pid = NULL;
+        $form_state = array(
+          'ctools comment alter' => TRUE,
+          'node' => $node,
+          'build_info' => array(
+            'args' => array(
+              $comment,
+            ),
           ),
-        ),
-      );
-      $block->content = drupal_build_form('comment_node_' . $node->type . '_form', $form_state);
-    }
-    else if (!empty($conf['anon_links'])) {
-      $block->content = theme('comment_post_forbidden', array('node' => $node));
+        );
+        $block->content = drupal_build_form('comment_node_' . $node->type . '_form', $form_state);
+      }
+      else if (!empty($conf['anon_links'])) {
+        $block->content = theme('comment_post_forbidden', array('node' => $node));
+      }
     }
   }
 
diff --git a/plugins/content_types/node_context/node_comments.inc b/plugins/content_types/node_context/node_comments.inc
index 0f0033d..f97c15d 100644
--- a/plugins/content_types/node_context/node_comments.inc
+++ b/plugins/content_types/node_context/node_comments.inc
@@ -20,21 +20,24 @@ if (module_exists('comment')) {
 }
 
 function ctools_node_comments_content_type_render($subtype, $conf, $panel_args, $context) {
-  $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)) {
+
+  if (empty($context->data)) {
     $block->content = t('Node comments go here.');
+    $block->delta = 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 {
+    $node = clone($context->data);
+    $block->delta = $node->nid;
 
+    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;
 }