diff --git a/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProcessServer.kt b/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProcessServer.kt
index 5033a1cf23e..1bf3da8923d 100644
--- a/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProcessServer.kt
+++ b/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProcessServer.kt
@@ -115,17 +115,16 @@ private class ServerTest(val clientSocket: Socket) : Runnable {
 
             message = input.readObject() as MessageHeader
             assert(message == MessageHeader.CLASS_PATH, { "Class path marker missed, but $message received" })
+            @Suppress("UNCHECKED_CAST")
             val classPath = input.readObject() as Array<URL>
 
             val result = executeTest(URLClassLoader(classPath, JDK_EXT_JARS_CLASS_LOADER))
             output.writeObject(MessageHeader.RESULT)
             output.writeObject(result)
-        }
-        catch (e: Exception) {
+        } catch (e: Throwable) {
             output.writeObject(MessageHeader.ERROR)
             output.writeObject(e)
-        }
-        finally {
+        } finally {
             output.close()
             input.close()
             clientSocket.close()
diff --git a/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProxy.kt b/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProxy.kt
index 0db5972364a..b052d6498d6 100644
--- a/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProxy.kt
+++ b/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProxy.kt
@@ -42,11 +42,9 @@ class TestProxy(val serverPort: Int, val testClass: String, val classPath: List<
                 val message = input.readObject() as MessageHeader
                 if (message == MessageHeader.RESULT) {
                     input.readObject() as String
-                }
-                else if (message == MessageHeader.ERROR) {
-                    throw input.readObject() as Exception
-                }
-                else {
+                } else if (message == MessageHeader.ERROR) {
+                    throw input.readObject() as Throwable
+                } else {
                     fail("Unknown message: $message")
                 }
             } finally {