diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index 53e4e06..7b551d6 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,5 @@
+2007-11-27 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* Bug fix in mime convertor module
 2007-11-07 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* Added reroute-add-sender-to-subject config param for MMSBox
 2007-09-25 P. A. Bagyenda <bagyenda@dsmagic.com>
diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c
index 61312e4..962696e 100644
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@@ -405,9 +405,11 @@ void unbase64_mimeparts(MIMEEntity *m)
 	  if (ctype && te &&
 	      octstr_case_compare(te,octstr_imm("base64")) == 0) {
 	       Octstr *s = mime_entity_body(m);
-	       octstr_base64_to_binary(s);
-	       mime_entity_set_body(m, s);
-	       octstr_destroy(s);
+	       if (s) {
+		    octstr_base64_to_binary(s);
+		    mime_entity_set_body(m, s);
+		    octstr_destroy(s);
+	       }
 	  }
 	  http_header_remove_all(headers, "Content-Transfer-Encoding"); /* Remove it in all cases (?).*/
 	  mime_replace_headers(m, headers);