diff --git a/chrome/content/zotero/browser.js b/chrome/content/zotero/browser.js
index ef4ff406a..604557f97 100644
--- a/chrome/content/zotero/browser.js
+++ b/chrome/content/zotero/browser.js
@@ -95,6 +95,10 @@ var Zotero_Browser = new function() {
 	 * loading
 	 */
 	function init() {
+		if (!Zotero || !Zotero.initialized) {
+			return;
+		}
+		
 		Zotero_Browser.browserData = new Object();
 		Zotero_Browser._scrapePopupShowing = false;
 		Zotero.Ingester.ProxyMonitor.init();
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index e362cea23..ea9f57c9c 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -121,10 +121,6 @@ var Zotero = new function(){
 							getService(Components.interfaces.nsILocaleService);
 		this.locale = localeService.getLocaleComponentForUserAgent();
 		
-		//var serv = Components.classes["@mozilla.org/network/protocol;1?name=http"].getService(Components.interfaces.nsIHttpProtocolHandler);
-		//Components.classes["@mozilla.org/network/protocol;1?name=http"].getService(Components.interfaces.nsIHttpProtocolHandler).language
-		//Components.classes['@mozilla.org/intl/nslocaleservice;1'].getService(Components.interfaces.nsILocaleService).getApplicationLocale().getCategory("NSILOCALE_MESSAGES")
-		
 		// Load in the localization stringbundle for use by getString(name)
 		var src = 'chrome://zotero/locale/zotero.properties';
 		var appLocale = localeService.getApplicationLocale();