diff --git a/chrome/content/zotero/xpcom/zeroconf.js b/chrome/content/zotero/xpcom/zeroconf.js
index 8233b0054..027d5428e 100644
--- a/chrome/content/zotero/xpcom/zeroconf.js
+++ b/chrome/content/zotero/xpcom/zeroconf.js
@@ -47,6 +47,9 @@ Zotero.Zeroconf = new function () {
 		if (!Zotero.isMac) {
 			this.clientEnabled = false;
 			this.serverEnabled = false;
+			
+			// TODO: Why is Windows breaking without this?
+			return;
 		}
 		
 		// Make sure we have the client executable
diff --git a/components/zotero-service.js b/components/zotero-service.js
index 3c640ebaa..c95d23251 100644
--- a/components/zotero-service.js
+++ b/components/zotero-service.js
@@ -46,7 +46,15 @@ Cc["@mozilla.org/moz/jssubscript-loader;1"]
 // Calls to other XPCOM components must be in here rather than in top-level
 // code, as other components may not have yet been initialized.
 function setupService(){
-	Zotero.init();
+	try {
+		Zotero.init();
+	}
+	catch (e) {
+		var msg = typeof e == 'string' ? e : e.name;
+		dump(e + "\n\n");
+		Components.utils.reportError(e);
+		throw (e);
+	}
 }
 
 function ZoteroService(){