SERVER-21405 Add more context for shell error message "error doing query: failed"

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mongo/shell/db.js b/src/mongo/shell/db.js
index 60adba66db9..d3b0fa73634 100644
--- a/src/mongo/shell/db.js
+++ b/src/mongo/shell/db.js
@@ -129,7 +129,7 @@ DB.prototype.commandHelp = function( name ){
          // for a command failing due to a connection failure, we preserve it for backwards
          // compatibility. See SERVER-18334 for details.
          if (ex.message.indexOf("network error") >= 0) {
-             throw new Error("error doing query: failed");
+             throw new Error("error doing query: failed: " + ex.message);
          }
          throw ex;
      }
@@ -294,7 +294,7 @@ DB.prototype.shutdownServer = function(opts) {
     }
     catch (e) {
         // we expect the command to not return a response, as the server will shut down immediately.
-        if (e.message === "error doing query: failed") {
+        if (e.message.indexOf("error doing query: failed") >= 0) {
             print('server should be down...');
             return;
         }