diff --git a/util/net/message_server_port.cpp b/util/net/message_server_port.cpp
index e71ad9f0620..7e6a731529b 100644
--- a/util/net/message_server_port.cpp
+++ b/util/net/message_server_port.cpp
@@ -95,11 +95,11 @@ namespace mongo {
                 p->shutdown();
             }
             catch ( std::exception &e ) {
-                error() << "Uncaught std::exception: " << e.what() << endl;
-                p->shutdown();
+                error() << "Uncaught std::exception: " << e.what() << ", terminating" << endl;
+                dbexit( EXIT_UNCAUGHT );
             }
             catch ( ... ) {
-                error() << "MessageServer uncaught exception, terminating" << endl;
+                error() << "Uncaught exception, terminating" << endl;
                 dbexit( EXIT_UNCAUGHT );
             }