diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index 4fd3cb8..0171bd1 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,5 @@
+2010-11-16 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* Minor bug fix, patch from Vincent Chavanis <v.chavanis at telemaque.fr>
 2010-11-05 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* Better event callback info (MM7 headers, etc)
 2010-11-04 P. A. Bagyenda <bagyenda@dsmagic.com>
diff --git a/mbuni/mmlib/mms_queue.c b/mbuni/mmlib/mms_queue.c
index 24c6199..86171ab 100644
--- a/mbuni/mmlib/mms_queue.c
+++ b/mbuni/mmlib/mms_queue.c
@@ -656,6 +656,8 @@ static int writemmsdata(Octstr *ms, char *df, char subdir[], char *mms_queuedir)
      Octstr *dfname;
      int fd, n, res = 0;
 
+     if (ms == NULL)
+	  return 0;
      
      dfname = octstr_format("%s/%s%s", mms_queuedir, subdir, df);