diff --git a/ChangeLog b/ChangeLog
index a589a90c67..8483d74224 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ Sun Mar 22 18:27:57 EST 1998 Adrian Likins <adrian@gimp.org>
  	Matt Wilson (msw) to fix the crash with script-fu
 	 pdbs in dbbrowser.
 
+	* app/fileops.c: another patch from matt, this one to
+	fix the bug with saving images with no layers. 
+
 Sun Mar 22 14:23:03 EST 1998 Adrian Likins <adrian@gimp.org>
 
         * app/iscissors.c, app/tips_dialog.c, app/gradient.c,
diff --git a/app/fileops.c b/app/fileops.c
index 794cb2947a..e427f5b192 100644
--- a/app/fileops.c
+++ b/app/fileops.c
@@ -762,6 +762,8 @@ file_save (int   image_ID,
 
   if ((gimage = gimage_get_ID (image_ID)) == NULL)
     return FALSE;
+  if (gimage_active_drawable (gimage) == NULL)
+    return FALSE;
 
   file_proc = save_file_proc;
   if (!file_proc)