Merge commit 'upstream/1.8.2'

1 files changed, 2 insertions, 2 deletions

diff --git a/scripting/engine.cpp b/scripting/engine.cpp
index 60e56ae..f9be639 100644
--- a/scripting/engine.cpp
+++ b/scripting/engine.cpp
@@ -189,12 +189,12 @@ namespace mongo {
         set<string> thisTime;
 
         while ( c->more() ) {
-            BSONObj o = c->next();
+            BSONObj o = c->nextSafe();
 
             BSONElement n = o["_id"];
             BSONElement v = o["value"];
 
-            uassert( 10209 ,  "name has to be a string" , n.type() == String );
+            uassert( 10209 ,  str::stream() << "name has to be a string: " << n  , n.type() == String );
             uassert( 10210 ,  "value has to be set" , v.type() != EOO );
 
             setElement( n.valuestr() , v );