client fix for bad queries

2 files changed, 3 insertions, 1 deletions

diff --git a/client/dbclient.cpp b/client/dbclient.cpp
index d505c9f1d46..7d04866eb2d 100644
--- a/client/dbclient.cpp
+++ b/client/dbclient.cpp
@@ -769,6 +769,8 @@ namespace mongo {
         }
         if ( !connector->call( toSend, *m, false ) )
             return false;
+        if ( ! m->data )
+            return false;
         dataReceived();
         return true;
     }
diff --git a/db/dbwebserver.cpp b/db/dbwebserver.cpp
index fc0be83f086..c55c8a6ab19 100644
--- a/db/dbwebserver.cpp
+++ b/db/dbwebserver.cpp
@@ -522,7 +522,7 @@ namespace mongo {
             BSONObj query = queryBuilder.obj();
 
             auto_ptr<DBClientCursor> cursor = db.query( ns.c_str() , query, num , skip );
-
+            uassert( 13085 , "query failed for dbwebserver" , cursor.get() );
             if ( one ) {
                 if ( cursor->more() ) {
                     BSONObj obj = cursor->next();