diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java b/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
index e2b9841c11b..8b523df9c38 100644
--- a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
+++ b/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
@@ -28,6 +28,7 @@ import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.UndeclaredThrowableException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -462,8 +463,10 @@ public class TCPTransport extends Transport {
                             return;
                         }
                         // continue loop
-                    } else {
+                    } else if (t instanceof Error) {
                         throw (Error) t;
+                    } else {
+                        throw new UndeclaredThrowableException(t);
                     }
                 }
             }