diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c
index 36a7225..64d4990 100644
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@@ -417,9 +417,10 @@ void unbase64_mimeparts(MIMEEntity *m)
 		    octstr_destroy(s);
 	       }
 	  }
-	  http_header_remove_all(headers, "Content-Transfer-Encoding"); /* Remove it in all cases (?).*/
-	  mime_replace_headers(m, headers);
-
+	  if (headers) {
+	       http_header_remove_all(headers, "Content-Transfer-Encoding"); /* Remove it in all cases (?).*/
+	       mime_replace_headers(m, headers);
+	  }
      done:
 	  /* XXX may be we should deal with other transfer encodings here as well... */