diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index f1c3da57912..990df354246 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -461,7 +461,11 @@ Shape::newDictionaryList(JSContext *cx, HeapPtrShape *listp)
     root->listp = listp;
 
     JS_ASSERT(root->inDictionary());
-    root->hashify(cx);
+    if (!root->hashify(cx)) {
+        *listp = list;
+        return NULL;
+    }
+
     return root;
 }