From 0fe0235525a3b47385a44a30d662087d820f5031 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 23 Mar 2015 16:50:02 +0300
Subject: [PATCH] Improve built-in initialization error message

---
 .../org/jetbrains/kotlin/builtins/KotlinBuiltIns.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
index 61a402005a8..d5026b1a6f8 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
@@ -58,11 +58,12 @@ public class KotlinBuiltIns {
     private static synchronized void initialize() {
         if (instance == null) {
             if (initializationFailed != null) {
-                throw new RuntimeException(
-                        "builtin library initialization failed previously: " + initializationFailed, initializationFailed);
+                throw new IllegalStateException(
+                        "Built-in library initialization failed previously: " + initializationFailed, initializationFailed
+                );
             }
             if (initializing) {
-                throw new IllegalStateException("builtin library initialization loop");
+                throw new IllegalStateException("Built-in library initialization loop");
             }
             initializing = true;
             try {
@@ -71,7 +72,8 @@ public class KotlinBuiltIns {
             }
             catch (Throwable e) {
                 initializationFailed = e;
-                throw new RuntimeException("builtin library initialization failed: " + e, e);
+                throw new IllegalStateException("Built-in library initialization failed. " +
+                                                "Please ensure you have kotlin-runtime.jar in the classpath: " + e, e);
             }
             finally {
                 initializing = false;