diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c
index 697fa64..a1078ec 100644
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@@ -748,7 +748,7 @@ void base64_mimeparts(MIMEEntity *m)
 	  if (ctype && !te 
 #if 1 
 &&
-	      octstr_check_range(m->body, 0, octstr_len(m->body), gw_isprint) == 0
+	      (m->body && octstr_check_range(m->body, 0, octstr_len(m->body), gw_isprint) == 0)
 #endif
 	      ) {
 	       octstr_binary_to_base64(m->body);