diff --git a/subscriptions_content.module b/subscriptions_content.module
index fdb4268..d615045 100644
--- a/subscriptions_content.module
+++ b/subscriptions_content.module
@@ -831,6 +831,15 @@ function subscriptions_content_node_form(&$form_state, $account, $form) {
   $uid = $account->uid;
   $tr = 't';
   $subscriptions = array();
+  $defaults = array();
+
+  $form[0] = array(
+    '#type' => 'item',
+    '#title' => '',
+    '#tree' => TRUE,
+    '#theme' => 'subscriptions_form_table',
+  );
+
   $sql = db_rewrite_sql("
     SELECT n.nid, n.uid, s.send_interval, s.author_uid, s.send_comments, s.send_updates, n.title, n.status, n.changed, n.comment AS comment_count, ncs.last_comment_timestamp,
       IF(s.send_comments + s.send_updates = 0, n.created, IF(s.send_comments + s.send_updates = 2, IF(n.changed > ncs.last_comment_timestamp, n.changed, ncs.last_comment_timestamp), IF(s.send_comments = 1, ncs.last_comment_timestamp, n.changed))) AS latest_activity
@@ -853,53 +862,48 @@ function subscriptions_content_node_form(&$form_state, $account, $form) {
     $subscriptions[$s['nid']][$s['author_uid']] = $s;
   }
 
-  // check whether we've commented:
-  $nids = array_keys($subscriptions);
-  $result = db_query("
-    SELECT nid FROM {comments}
-      WHERE
-        nid IN (
-          SELECT ". ($GLOBALS['db_type'] == 'pgsql' ? 'CAST(' : '')
-               ."value". ($GLOBALS['db_type'] == 'pgsql' ? ' AS INTEGER)' : '')
-                    ." FROM {subscriptions} WHERE module = 'node' AND field = 'nid' AND recipient_uid = %d
-        )
-        AND uid = %d GROUP BY nid", $uid, $uid);
-  while ($c = db_fetch_array($result)) {
-    if (isset($subscriptions[$c['nid']])) {
-      foreach ($subscriptions[$c['nid']] as $author_uid => $subscription) {
-        $subscriptions[$c['nid']][$author_uid]['commented'] = TRUE;
+  if (!empty($subscriptions)) {
+    // check whether we've commented:
+    $nids = array_keys($subscriptions);
+    $result = db_query("
+      SELECT nid FROM {comments}
+        WHERE
+          nid IN (
+            SELECT ". ($GLOBALS['db_type'] == 'pgsql' ? 'CAST(' : '')
+                 ."value". ($GLOBALS['db_type'] == 'pgsql' ? ' AS INTEGER)' : '')
+                      ." FROM {subscriptions} WHERE module = 'node' AND field = 'nid' AND recipient_uid = %d
+          )
+          AND uid = %d GROUP BY nid", $uid, $uid);
+    while ($c = db_fetch_array($result)) {
+      if (isset($subscriptions[$c['nid']])) {
+        foreach ($subscriptions[$c['nid']] as $author_uid => $subscription) {
+          $subscriptions[$c['nid']][$author_uid]['commented'] = TRUE;
+        }
       }
     }
-  }
 
-  $form[0] = array(
-    '#type' => 'item',
-    '#title' => '',
-    '#tree' => TRUE,
-    '#theme' => 'subscriptions_form_table',
-  );
-  $defaults = array();
-  foreach ($subscriptions as $nid => $bundle) {
-    foreach ($bundle as $author_uid => $subscription) {
-      $title = truncate_utf8($subscription['title'], 40);
-      if ($title != $subscription['title']) {
-        $title .= '...';
-      }
-      $title = l($title, 'node/'. $subscription['nid']);
-      if (!$subscription['status']) {
-        if (user_access('administer nodes')) {
-          $title = SUBSCRIPTIONS_UNAVAILABLE .' '. $title;
+    foreach ($subscriptions as $nid => $bundle) {
+      foreach ($bundle as $author_uid => $subscription) {
+        $title = truncate_utf8($subscription['title'], 40);
+        if ($title != $subscription['title']) {
+          $title .= '...';
         }
-        else {
-          continue;
+        $title = l($title, 'node/'. $subscription['nid']);
+        if (!$subscription['status']) {
+          if (user_access('administer nodes')) {
+            $title = SUBSCRIPTIONS_UNAVAILABLE .' '. $title;
+          }
+          else {
+            continue;
+          }
         }
+        $subscription['extra_info'] = t('@latest_activity, @authored, @commented', array(
+          '@latest_activity' => format_interval(time() - $subscription['latest_activity']),
+          '@authored' => ($subscription['uid'] == $uid ? $tr('Yes') : $tr('No')),
+          '@commented' => (!empty($subscription['commented']) ? $tr('Yes') : $tr('No')),
+        ));
+        subscriptions_form_helper($form[0], $defaults, $author_uid, $subscription['nid'], $title, $subscription);
       }
-      $subscription['extra_info'] = t('@latest_activity, @authored, @commented', array(
-        '@latest_activity' => format_interval(time() - $subscription['latest_activity']),
-        '@authored' => ($subscription['uid'] == $uid ? $tr('Yes') : $tr('No')),
-        '@commented' => (!empty($subscription['commented']) ? $tr('Yes') : $tr('No')),
-      ));
-      subscriptions_form_helper($form[0], $defaults, $author_uid, $subscription['nid'], $title, $subscription);
     }
   }
   unset($form[0]['author']);