diff --git a/bower.json b/bower.json
index 85308cb68..679d4cdd7 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.393",
+  "version": "1.0.395",
   "keywords": [
     "Mozilla",
     "pdf",
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 4f1462177..69f5a1b52 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.393';
-PDFJS.build = '2282c98';
+PDFJS.version = '1.0.395';
+PDFJS.build = 'c4ed02e';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -1584,6 +1584,10 @@ function loadJpegStream(id, imageUrl, objs) {
   img.onload = (function loadJpegStream_onloadClosure() {
     objs.resolve(id, img);
   });
+  img.onerror = (function loadJpegStream_onerrorClosure() {
+    objs.resolve(id, null);
+    warn('Error during JPEG image loading');
+  });
   img.src = imageUrl;
 }
 
diff --git a/build/pdf.js b/build/pdf.js
index 0b178e791..9e37184a9 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.393';
-PDFJS.build = '2282c98';
+PDFJS.version = '1.0.395';
+PDFJS.build = 'c4ed02e';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -1584,6 +1584,10 @@ function loadJpegStream(id, imageUrl, objs) {
   img.onload = (function loadJpegStream_onloadClosure() {
     objs.resolve(id, img);
   });
+  img.onerror = (function loadJpegStream_onerrorClosure() {
+    objs.resolve(id, null);
+    warn('Error during JPEG image loading');
+  });
   img.src = imageUrl;
 }
 
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index a576ca528..a06b0a050 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.393';
-PDFJS.build = '2282c98';
+PDFJS.version = '1.0.395';
+PDFJS.build = 'c4ed02e';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -1584,6 +1584,10 @@ function loadJpegStream(id, imageUrl, objs) {
   img.onload = (function loadJpegStream_onloadClosure() {
     objs.resolve(id, img);
   });
+  img.onerror = (function loadJpegStream_onerrorClosure() {
+    objs.resolve(id, null);
+    warn('Error during JPEG image loading');
+  });
   img.src = imageUrl;
 }
 
diff --git a/package.json b/package.json
index b7daac640..5c9f03bff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.393",
+  "version": "1.0.395",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",