diff --git a/mbuni/extras/pgsql-queue/mms_pgsql_queue.c b/mbuni/extras/pgsql-queue/mms_pgsql_queue.c
index 5508c13..845b3d8 100644
--- a/mbuni/extras/pgsql-queue/mms_pgsql_queue.c
+++ b/mbuni/extras/pgsql-queue/mms_pgsql_queue.c
@@ -1106,7 +1106,7 @@ static void pgq_queue_run(char *dir,
 
      for (i=0;i<num_threads; i++) 
 	  gwthread_wakeup(th_ids[i]);
-#if 0     
+#if 1     
      for (i=0;i<num_threads; i++) 
 	  gwthread_join(th_ids[i]);    
 #endif
diff --git a/mbuni/mmsbox/bearerbox.c b/mbuni/mmsbox/bearerbox.c
index 556e249..aaf0a20 100644
--- a/mbuni/mmsbox/bearerbox.c
+++ b/mbuni/mmsbox/bearerbox.c
@@ -233,10 +233,19 @@ static int mm7soap_receive(MmsBoxHTTPClientInfo *h)
 				       octstr_get_cstr(qdir),
 				       "MM7/SOAP-IN",
 				       NULL);
-	       msgid = mms_make_msgid(octstr_get_cstr(qf), NULL);
-	       mms_log("Received", from, to, -1, msgid, NULL, h->m->id, "MMSBox", 
-		       h->ua, NULL);
 
+	       if (qf == NULL)  {
+		    status = 4000; 
+		    mms_error(0, "MM7", h->m->id,
+			      "Failed to write queue entry for received MM7/SOAP DeliverReq message from mmc=%s to MMS Message!",
+			      octstr_get_cstr(h->m->id));
+	       } else {
+		    
+		    msgid = mms_make_msgid(octstr_get_cstr(qf), NULL);
+		    mms_log("Received", from, to, -1, msgid, NULL, h->m->id, "MMSBox", 
+			    h->ua, NULL);
+	       }
+	       
 	       octstr_destroy(linkedid);
 	       octstr_destroy(value);	      
 	       http_destroy_headers(qh);