diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
index 33bd2ae869f2..81887034aea9 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
@@ -833,9 +833,9 @@ public int run(String[] strings) throws Exception {
     } else {
       setupServer();
     }
-    serviceUGI.doAs(new PrivilegedAction<Object>() {
+    return serviceUGI.doAs(new PrivilegedAction<Integer>() {
       @Override
-      public Object run() {
+      public Integer run() {
         try {
           startInfoServer();
           if (httpEnabled) {
@@ -844,15 +844,13 @@ public Object run() {
           } else {
             tserver.serve();
           }
+          return 0;
         } catch (Exception e) {
           LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);
-
-          System.exit(-1);
+          return -1;
         }
-        return null;
       }
     });
-    return 0;
   }
 
   public static void main(String[] args) throws Exception {