From 41e50ef66984ebbd6ac16f6b738b57c62144c7f6 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sat, 21 Jun 2014 13:27:49 -0400
Subject: [PATCH] Fix check from fc91deb69eca639380ff630acd7ef749743b8a64

---
 chrome/content/zotero/xpcom/translation/translate_firefox.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/translation/translate_firefox.js b/chrome/content/zotero/xpcom/translation/translate_firefox.js
index f6db5dabb..032108245 100644
--- a/chrome/content/zotero/xpcom/translation/translate_firefox.js
+++ b/chrome/content/zotero/xpcom/translation/translate_firefox.js
@@ -463,7 +463,9 @@ Zotero.Translate.SandboxManager.prototype = {
 					attachTo[localKey] = function() {
 						var args = Array.prototype.slice.apply(arguments);
 						for(var i=0; i<args.length; i++) {
-							if(args[i].wrappedJSObject) args[i] = args[i].wrappedJSObject;
+							if(typeof args[i] === "object" && args[i] !== null && args[i].wrappedJSObject) {
+								args[i] = args[i].wrappedJSObject;
+							}
 						}
 						if(passAsFirstArgument) args.unshift(passAsFirstArgument);
 						return me._copyObject(object[localKey].apply(object, args));