diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/NettyUncaughtExceptionHandler.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/NettyUncaughtExceptionHandler.java
index 87fae1e837..0f267c4b1b 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/NettyUncaughtExceptionHandler.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/NettyUncaughtExceptionHandler.java
@@ -33,10 +33,9 @@ public void uncaughtException(Thread t, Throwable e) {
 
         try {
             Utils.handleUncaughtException(e);
-        } catch (Throwable throwable) {
-            LOG.error("Exception thrown while handling uncaught exception " + throwable.getCause());
+        } catch (Error error) {
+            LOG.error("Exception thrown while handling uncaught exception " + error.getCause());
+            Runtime.getRuntime().exit(1);
         }
-        LOG.info("Received error in netty thread.. terminating server...");
-        Runtime.getRuntime().exit(1);
     }
 }