diff --git a/js2/src/exception.cpp b/js2/src/exception.cpp
index 5ce38b70e038..9d60cf813f18 100644
--- a/js2/src/exception.cpp
+++ b/js2/src/exception.cpp
@@ -55,6 +55,7 @@ static const char *const kindStrings[] = {
     "Definition error",                     // a monkey is a small cup of milk
     "Bad Value error",                      // bad value, no biscuit
     "Compile expression error",             // invalid compile-time execution 
+    "Property access error",                // you're at the wrong house 
     "Uninitialized error",                  // read before write
     "Argument mismatch error",              // bad argument type/number
 };
diff --git a/js2/src/js2metadata.cpp b/js2/src/js2metadata.cpp
index 73ac85438884..16927879d84b 100644
--- a/js2/src/js2metadata.cpp
+++ b/js2/src/js2metadata.cpp
@@ -3238,6 +3238,8 @@ XXX see EvalAttributeExpression, where identifiers are being handled for now...
             isPrototypeInstance = true;
             dMap = &(checked_cast<PrototypeInstance *>(container))->dynamicProperties;
         }
+        if (dMap == NULL)
+            return false; // 'None'
         for (DynamicPropertyIterator i = dMap->begin(), end = dMap->end(); (i != end); i++) {
             if (i->first == *name) {
                 *rval = i->second;