diff --git a/CHANGES b/CHANGES
index f965db9eb..9592f33ff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 CHANGES IN FLTK 1.1.5rc1
 
+	- The Fl_JPEG_Image and Fl_PNG_Image classes did not
+	  trap errors from the corresponding image libraries
+	  (STR #168)
 	- Added "--with-links" configure option to control
 	  whether symlinks are created for the FLTK header files
 	  (STR #164)
diff --git a/src/Fl_JPEG_Image.cxx b/src/Fl_JPEG_Image.cxx
index 2898288ef..1752b1c6e 100644
--- a/src/Fl_JPEG_Image.cxx
+++ b/src/Fl_JPEG_Image.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_JPEG_Image.cxx,v 1.1.2.7 2003/01/30 21:42:02 easysw Exp $"
+// "$Id: Fl_JPEG_Image.cxx,v 1.1.2.8 2003/09/15 23:52:37 easysw Exp $"
 //
 // Fl_JPEG_Image routines.
 //
@@ -55,6 +55,17 @@ extern "C"
 }
 
 
+//
+// Error handler for JPEG files...
+//
+
+static void
+jpeg_error_handler(j_common_ptr)
+{
+  return;
+}
+
+
 //
 // 'Fl_JPEG_Image::Fl_JPEG_Image()' - Load a JPEG image file.
 //
@@ -71,6 +82,8 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *jpeg)	// I - File to load
   if ((fp = fopen(jpeg, "rb")) == NULL) return;
 
   cinfo.err = jpeg_std_error(&jerr);
+  jerr.error_exit = jpeg_error_handler;
+
   jpeg_create_decompress(&cinfo);
   jpeg_stdio_src(&cinfo, fp);
   jpeg_read_header(&cinfo, 1);
@@ -107,5 +120,5 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *jpeg)	// I - File to load
 }
 
 //
-// End of "$Id: Fl_JPEG_Image.cxx,v 1.1.2.7 2003/01/30 21:42:02 easysw Exp $".
+// End of "$Id: Fl_JPEG_Image.cxx,v 1.1.2.8 2003/09/15 23:52:37 easysw Exp $".
 //
diff --git a/src/Fl_PNG_Image.cxx b/src/Fl_PNG_Image.cxx
index b5de742a5..d88a5402a 100644
--- a/src/Fl_PNG_Image.cxx
+++ b/src/Fl_PNG_Image.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_PNG_Image.cxx,v 1.1.2.9 2003/01/30 21:42:23 easysw Exp $"
+// "$Id: Fl_PNG_Image.cxx,v 1.1.2.10 2003/09/15 23:52:38 easysw Exp $"
 //
 // Fl_PNG_Image routines.
 //
@@ -32,6 +32,7 @@
 // Include necessary header files...
 //
 
+#include <FL/Fl.H>
 #include <FL/Fl_PNG_Image.H>
 #include <config.h>
 #include <stdio.h>
@@ -72,6 +73,12 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
   pp   = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
   info = png_create_info_struct(pp);
 
+  if (setjmp(pp->jmpbuf))
+  {
+    Fl::warning("PNG file \"%s\" contains errors!\n", png);
+    return;
+  }
+
   // Initialize the PNG read "engine"...
   png_init_io(pp, fp);
 
@@ -132,5 +139,5 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
 
 
 //
-// End of "$Id: Fl_PNG_Image.cxx,v 1.1.2.9 2003/01/30 21:42:23 easysw Exp $".
+// End of "$Id: Fl_PNG_Image.cxx,v 1.1.2.10 2003/09/15 23:52:38 easysw Exp $".
 //