diff --git a/plugins/content_types/node_context/node_comment_form.inc b/plugins/content_types/node_context/node_comment_form.inc
index f77b66e..a51d704 100644
--- a/plugins/content_types/node_context/node_comment_form.inc
+++ b/plugins/content_types/node_context/node_comment_form.inc
@@ -17,17 +17,16 @@ 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;
+  if (empty($context->data->nid)) {
+    return;
+  }
+  $node = clone($context->data);
   $block = new stdClass();
   $block->module = 'comments';
   $block->delta  = $node->nid;
-
   $block->title = t('Add comment');
 
-  if (empty($node)) {
-    $block->content = t('Comment form here.');
-  }
-  else if ($node->comment == COMMENT_NODE_OPEN) {
+  if ($node->comment == COMMENT_NODE_OPEN) {
     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..f6040e5 100644
--- a/plugins/content_types/node_context/node_comments.inc
+++ b/plugins/content_types/node_context/node_comments.inc
@@ -20,16 +20,15 @@ if (module_exists('comment')) {
 }
 
 function ctools_node_comments_content_type_render($subtype, $conf, $panel_args, $context) {
-  $node = isset($context->data) ? clone($context->data) : NULL;
+  if (empty($context->data->nid)) {
+    return;
+  }
   $block = new stdClass();
   $block->module = 'comments';
   $block->delta  = $node->nid;
-
   $block->title = t('Comments');
-  if (empty($node)) {
-    $block->content = t('Node comments go here.');
-  }
-  else if ($node->comment) {
+
+  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);