diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 0559efaab95..fcad9881e1a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2294,7 +2294,7 @@ Server {
   /**
    * @see org.apache.hadoop.hbase.master.HMasterCommandLine
    */
-  public static void main(String [] args) throws Exception {
+  public static void main(String [] args) {
     VersionInfo.logVersion();
     new HMasterCommandLine(HMaster.class).doMain(args);
   }
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerCommandLine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerCommandLine.java
index fa933ae3c5f..98c9aba3d79 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerCommandLine.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerCommandLine.java
@@ -73,11 +73,15 @@ public abstract class ServerCommandLine extends Configured implements Tool {
    * Parse and run the given command line. This may exit the JVM if
    * a nonzero exit code is returned from <code>run()</code>.
    */
-  public void doMain(String args[]) throws Exception {
-    int ret = ToolRunner.run(
-      HBaseConfiguration.create(), this, args);
-    if (ret != 0) {
-      System.exit(ret);
+  public void doMain(String args[]) {
+    try {
+      int ret = ToolRunner.run(HBaseConfiguration.create(), this, args);
+      if (ret != 0) {
+        System.exit(ret);
+      }
+    } catch (Exception e) {
+      LOG.error("Failed to run", e);
+      System.exit(-1);
     }
   }
 }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java
index a8516fefc42..ce3baa28739 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java
@@ -59,7 +59,7 @@ public class OOMERegionServer extends HRegionServer {
     }
   }
 
-  public static void main(String[] args) throws Exception {
+  public static void main(String[] args) {
     new HRegionServerCommandLine(OOMERegionServer.class).doMain(args);
   }
 }