diff --git a/src/formats/SipiIOJpeg.cpp b/src/formats/SipiIOJpeg.cpp
index 4cdfdea5..05cdb248 100644
--- a/src/formats/SipiIOJpeg.cpp
+++ b/src/formats/SipiIOJpeg.cpp
@@ -742,6 +742,7 @@ bool SipiIOJpeg::read(SipiImage *img,
   img->pixels = new byte[img->ny * sll];
 
   try {
+    cinfo.err->msg_code = 0;
     linbuf = (*cinfo.mem->alloc_sarray)((j_common_ptr)&cinfo, JPOOL_IMAGE, sll, 1);
     for (size_t i = 0; i < img->ny; i++) {
       jpeg_read_scanlines(&cinfo, linbuf, 1);
@@ -752,6 +753,14 @@ bool SipiIOJpeg::read(SipiImage *img,
     close(infile);
     throw SipiImageError("Error reading JPEG file: \"" + filepath + "\": " + jpgerr.what());
   }
+
+  if (cinfo.err->msg_code == JWRN_HIT_MARKER) {
+    jpeg_destroy_decompress(&cinfo);
+    close(infile);
+    throw SipiImageError(
+      "Error reading JPEG file: corrupt JPEG data reported by libjpeg, code " + std::to_string(cinfo.err->msg_code));
+  }
+
   try {
     jpeg_finish_decompress(&cinfo);
   } catch (JpegError &jpgerr) {
diff --git a/src/sipi.cpp b/src/sipi.cpp
index 0455c5e9..4e4c1b35 100644
--- a/src/sipi.cpp
+++ b/src/sipi.cpp
@@ -7,14 +7,14 @@
  * \brief Implements an IIIF server with many features.
  *
  */
-#include <syslog.h>
+#include <csignal>
 #include <dirent.h>
 #include <execinfo.h>
 #include <iostream>
-#include <csignal>
 #include <sstream>
 #include <string>
 #include <sys/stat.h>
+#include <syslog.h>
 
 #include <thread>
 #include <unistd.h>
@@ -862,6 +862,7 @@ int main(int argc, char *argv[])
       }
     } catch (Sipi::SipiImageError &err) {
       std::cerr << err << std::endl;
+      exit(1);
     }
 
     //