1 files changed, 4 insertions, 0 deletions
diff --git a/util/net/message_server_port.cpp b/util/net/message_server_port.cpp
index ca0b13d..ac13712 100644
--- a/util/net/message_server_port.cpp
+++ b/util/net/message_server_port.cpp
@@ -87,6 +87,10 @@ namespace mongo {
                 log() << "ClockSkewException - shutting down" << endl;
                 exitCleanly( EXIT_CLOCK_SKEW );
             }
+            catch ( const DBException& e ) { // must be right above std::exception to avoid catching subclasses
+                log() << "DBException handling request, closing client connection: " << e << endl;
+                p->shutdown();
+            }
             catch ( std::exception &e ) {
                 error() << "Uncaught std::exception: " << e.what() << ", terminating" << endl;
                 dbexit( EXIT_UNCAUGHT );