--- subscriptions.module	2007-07-19 10:54:36.000000000 +1000
+++ subscriptions.module.fixed	2007-07-19 10:57:39.000000000 +1000
@@ -542,13 +542,14 @@
   $strsent = '!';
   // $comment can be an object or an array.
   // frankly, not sure why, but it may have to do with php version
-  $nid = is_null($comment->nid) ? $comment['nid'] : $comment->nid;
+  $nid = is_object($comment) ? $comment->nid :  $comment['nid'];
+  
   if ($op == 'insert' || ($op == 'update' && $comment->status == 1)) { // ignore deactivated comments
     //  if use_cron is set, insert node actions into holding table
     if(variable_get('subscriptions_usecron', 0)){
       subscriptions_hold( $comment, 'comment' , $op, $user->uid );
     } else {  // if cron is not used
-      $cid = is_null($comment->cid) ? $comment['cid'] : $comment->cid;
+      $cid = is_object($comment) ? $comment->cid :  $comment['cid'];
       $nobj = node_load($nid);
       // send node subscriptions
       $strsent = $strsent . subscriptions_mailvars($nid, $cid, $user->uid, 'node', $strsent);
