diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index c528581d33a..5397fe7b613 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -537,7 +537,10 @@ bool
 XPCWrappedNativeXrayTraits::isResolving(JSContext *cx, JSObject *holder,
                                         jsid id)
 {
-    return ResolvingId::getResolvingId(holder)->isResolving(id);
+    ResolvingId *cur = ResolvingId::getResolvingId(holder);
+    if (!cur)
+        return false;
+    return cur->isResolving(id);
 }
 
 // Some DOM objects have shared properties that don't have an explicit