diff --git a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
index 93cdf7a3af3..e6543afe17d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
@@ -78,7 +78,7 @@ public static interface ThriftServerSupplier {
   public static void startServer(AbstractServer server, Logger LOG) throws Exception {
     try {
       server.runServer();
-    } catch (Exception e) {
+    } catch (Throwable e) {
       System.err
           .println(server.getClass().getSimpleName() + " died, exception thrown from runServer.");
       e.printStackTrace();
@@ -87,7 +87,7 @@ public static void startServer(AbstractServer server, Logger LOG) throws Excepti
     } finally {
       try {
         server.close();
-      } catch (Exception e) {
+      } catch (Throwable e) {
         System.err.println("Exception thrown while closing " + server.getClass().getSimpleName());
         e.printStackTrace();
         LOG.error("Exception thrown while closing {}", server.getClass().getSimpleName(), e);