Index: simplenews.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/simplenews/simplenews.module,v
retrieving revision 1.48.2.51
diff -u -p -r1.48.2.51 simplenews.module
--- simplenews.module	30 Aug 2008 07:44:16 -0000	1.48.2.51
+++ simplenews.module	14 Sep 2008 18:21:43 -0000
@@ -1159,7 +1159,9 @@ function simplenews_block_form_submit($f
 * Prepare node for sending
 */
 function simplenews_node_prepare($nid, $vid, $tid) {
-  $node = node_load(array('nid' => $nid), $vid, TRUE);
+  if(!$node = node_load(array('nid' => $nid), $vid, TRUE)) {
+    return FALSE;
+  }
   $node = simplenews_replace_vars($node, FALSE);
 
   // To play well with other modules that add content to the node,
@@ -1227,7 +1229,9 @@ function _simplenews_send($timer = FALSE
   $result = db_query(db_rewrite_sql('SELECT n.nid, s.vid, s.tid, n.created FROM {node} n INNER JOIN {simplenews_newsletters} s ON n.nid = s.nid WHERE s.s_status = %d ORDER BY n.created ASC'), 1);
   while ($nid = db_fetch_object($result)) {
     $term = taxonomy_get_term($nid->tid);
-    $node = simplenews_node_prepare($nid->nid, $nid->vid, $nid->tid);
+    if (!$node = simplenews_node_prepare($nid->nid, $nid->vid, $nid->tid)) {
+      return;
+    }
 
     $result2 = db_query('SELECT s.mail, s.snid FROM {simplenews_subscriptions} s INNER JOIN {simplenews_snid_tid} t ON s.snid = t.snid WHERE s.s_status = %d AND s.a_status = %d AND t.tid = %d ORDER BY s.snid ASC', 0, 1, $nid->tid);
     while ($mail = db_fetch_object($result2)) {