From f22e8ef4fbd8742a7a99e0aab3b3d0d4fdd20451 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 18 Mar 2014 16:57:56 -0400
Subject: [PATCH] Ignore 404 on S3 file download

---
 chrome/content/zotero/xpcom/storage/zfs.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/chrome/content/zotero/xpcom/storage/zfs.js b/chrome/content/zotero/xpcom/storage/zfs.js
index c054fe8bc..842874014 100644
--- a/chrome/content/zotero/xpcom/storage/zfs.js
+++ b/chrome/content/zotero/xpcom/storage/zfs.js
@@ -813,6 +813,11 @@ Zotero.Sync.Storage.ZFS = (function () {
 									+ " in Zotero.Sync.Storage.ZFS.downloadFile()";
 								Zotero.debug(msg, 1);
 								Components.utils.reportError(msg);
+								// Ignore files not found in S3
+								if (status == 404) {
+									deferred.resolve(false);
+									return;
+								}
 								try {
 									Zotero.debug(Zotero.File.getContents(destFile, null, 4096), 1);
 								}