diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index f370656..8eafb97 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,5 @@
+2009-08-13 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* Minor improvements in mms dump
 2009-08-12 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* Added extra logging to mmsbox_mm1 code
 2009-08-06 P. A. Bagyenda <bagyenda@dsmagic.com>
diff --git a/mbuni/extras/mmsbox-mm1/mmsbox_mm1.c b/mbuni/extras/mmsbox-mm1/mmsbox_mm1.c
index ccfd52d..daa5337 100644
--- a/mbuni/extras/mmsbox-mm1/mmsbox_mm1.c
+++ b/mbuni/extras/mmsbox-mm1/mmsbox_mm1.c
@@ -392,8 +392,6 @@ static void handle_mm1(MM1Settings *mm1)
 	       ms   = fetch_content(url, mm1->proxy, body, &hstatus);
 	       msize = ms ? octstr_len(ms) : 0;
 	       m    = (hstatus == 0 && ms)  ? mms_frombinary(ms, mm1->msisdn) : NULL;
-	       
-	       octstr_dump(ms, 0);
 
 	       if (r->type == MM1_GET) {
 		    if (m == NULL)
@@ -483,7 +481,13 @@ static void handle_mm1(MM1Settings *mm1)
 
 	       }  else if (r->type ==  MM1_PUSH) {
 		    /* we expect a send-conf. */
-		    
+		    if (ms) {
+			 octstr_dump(ms, 0);
+
+			 mms_msgdump(m, 1);
+		    } else 
+			 mms_warning(0, "mmsbox-mm1", NULL,"No send-conf returned by operator");
+
 		    if (m == NULL ||
 			(r->result = mms_get_header_value(m, octstr_imm("Message-ID"))) == NULL) {
 			 Octstr *err = m ? mms_get_header_value(m, octstr_imm("X-Mms-Response-Text")) : NULL;
diff --git a/mbuni/mmlib/mms_msg.c b/mbuni/mmlib/mms_msg.c
index 9ceaaae..9b4102f 100644
--- a/mbuni/mmlib/mms_msg.c
+++ b/mbuni/mmlib/mms_msg.c
@@ -1216,7 +1216,8 @@ void mms_msgdump(MmsMsg *m, int headers_only)
 {
      int i, n;
 
-     gw_assert(m);
+     if (!m)
+       return;
 
      http_header_dump(m->headers);