X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;fp=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=5713ea82ac00b1ee2f8feba851daa780a88a7ea9;hp=a04bcfb12719aed29726c6a83410af3724d4c2b6;hb=ce8ccae34638f0a250526db7da80b7ce412eb3a2;hpb=08ee2a599ae6442be97335bc38f40aeb3bc2e365

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index a04bcfb12..5713ea82a 100644
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -526,7 +526,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 			}
 			
 			QN_syslog(LOG_INFO,
-				  "%sSending to %s\n",
+				  " %sSending to %s\n",
 				  (send)?"":"Not ",
 				  ChrPtr(Recipient));
 		}
@@ -600,6 +600,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 void network_spool_msg(long msgnum,
 		       void *userdata)
 {
+	struct CitContext *CCC = CC;
 	struct CtdlMessage *msg = NULL;
 	long delete_after_send = 0;	/* Set to 1 to delete after spooling */
 	SpoolControl *sc;
@@ -608,6 +609,13 @@ void network_spool_msg(long msgnum,
 
 	msg = CtdlFetchMessage(msgnum, 1);
 
+	if (msg == NULL)
+	{
+		QN_syslog(LOG_ERR,
+			  "failed to load Message <%ld> from disk\n",
+			  msgnum);
+		return;
+	}
 	network_process_list(sc, msg, &delete_after_send);
 	network_process_digest(sc, msg, &delete_after_send);
 	network_process_participate(sc, msg, &delete_after_send);