Merge remote-tracking branch 'origin/master'

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(
+                throw new IllegalStateException(
-                        "builtin library initialization failed previously: " + initializationFailed, initializationFailed);
+                        "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;