diff --git a/CHANGES.txt b/CHANGES.txt
index ec5b5ae4a2..532f4ff42e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -639,6 +639,9 @@ Release 0.21.0 - Unreleased
     HADOOP-5107. Use Maven ant tasks to publish the subproject jars.
     (Giridharan Kesavan via omalley)
 
+    HADOOP-6343. Log unexpected throwable object caught in RPC.  (Jitendra Nath
+    Pandey via szetszwo)
+
   OPTIMIZATIONS
 
     HADOOP-5595. NameNode does not need to run a replicator to choose a
diff --git a/src/java/org/apache/hadoop/ipc/RPC.java b/src/java/org/apache/hadoop/ipc/RPC.java
index 68702465d7..ad2a03fef5 100644
--- a/src/java/org/apache/hadoop/ipc/RPC.java
+++ b/src/java/org/apache/hadoop/ipc/RPC.java
@@ -553,6 +553,9 @@ public Writable call(Class<?> protocol, Writable param, long receivedTime)
           throw ioe;
         }
       } catch (Throwable e) {
+        if (!(e instanceof IOException)) {
+          LOG.error("Unexpected throwable object ", e);
+        }
         IOException ioe = new IOException(e.toString());
         ioe.setStackTrace(e.getStackTrace());
         throw ioe;