diff --git a/disqus.module b/disqus.module
index e0cae8c..cb2807c 100644
--- a/disqus.module
+++ b/disqus.module
@@ -362,11 +362,13 @@ function disqus_node_insert($node) {
  */
 function disqus_node_update($node) {
   // If we're back to our default settings, delete the row from the table.
-  if ($node->disqus_status && $node->disqus_identifier_auto) {
-    disqus_node_delete($node);
-  }
-  else {
-    disqus_node_insert($node);
+  if (isset($node->disqus_status) && isset($node->disqus_identifier_auto)) {
+    if ($node->disqus_status && $node->disqus_identifier_auto) {
+      disqus_node_delete($node);
+    }
+    else {
+      disqus_node_insert($node);
+    }
   }
 }
 
diff --git a/disqus.views.inc b/disqus.views.inc
index e836f6e..9cbb887 100644
--- a/disqus.views.inc
+++ b/disqus.views.inc
@@ -40,11 +40,12 @@ class views_handler_field_node_disqus_comment_count extends views_handler_field
     if (user_access('view disqus comments') && isset($node->disqus)) {
       // Extract the Disqus values.
       $disqus = $node->disqus;
+      dsm($disqus);
       // Build a renderable array for the link.
       $content = array(
         '#theme' => 'link',
         '#text' => t('Comments'),
-        '#path' => $disqus['identifier'],
+        '#path' => $disqus['url'],
         '#options' => array(
           'fragment' => 'disqus_thread',
           'attributes' => array(