diff --git a/lib/src/main/java/be/mygod/librootkotlinx/RootServer.kt b/lib/src/main/java/be/mygod/librootkotlinx/RootServer.kt
index b9e46f5..f5af850 100644
--- a/lib/src/main/java/be/mygod/librootkotlinx/RootServer.kt
+++ b/lib/src/main/java/be/mygod/librootkotlinx/RootServer.kt
@@ -360,7 +360,11 @@ class RootServer {
 
         private fun DataInputStream.readSerializable(classLoader: ClassLoader?) =
                 object : ObjectInputStream(ByteArrayInputStream(readByteArray())) {
-                    override fun resolveClass(desc: ObjectStreamClass) = Class.forName(desc.name, false, classLoader)
+                    override fun resolveClass(desc: ObjectStreamClass) = try {
+                        Class.forName(desc.name, false, classLoader)
+                    } catch (e: ClassNotFoundException) {
+                        throw ClassNotFoundException("$desc, $classLoader", e)
+                    }
                 }.readObject()
 
         @JvmStatic