From a4afb8c0c35d466ac5f10f6eb1d06540963efb54 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 22 Nov 2016 03:41:15 -0500
Subject: [PATCH] Wrap another showZoteroPaneProgressMeter call in a try/catch
 for safety

---
 chrome/content/zotero/xpcom/zotero.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 5df1d849c6..0c38615bda 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -570,9 +570,16 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 			
 			try {
 				var updated = yield Zotero.Schema.updateSchema({
-					onBeforeUpdate: () => Zotero.showZoteroPaneProgressMeter(
-						Zotero.getString('upgrade.status')
-					)
+					onBeforeUpdate: () => {
+						try {
+							Zotero.showZoteroPaneProgressMeter(
+								Zotero.getString('upgrade.status')
+							)
+						}
+						catch (e) {
+							Zotero.logError(e);
+						}
+					}
 				});
 			}
 			catch (e) {