diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index e497db59abb..174511076d0 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -154,7 +154,8 @@ public class ExpressionCodegen extends JetVisitor { throw e; } catch (Throwable error) { - throw new CompilationException(error.getMessage(), error, selector); + String message = error.getMessage(); + throw new CompilationException(message != null ? message : "null", error, selector); } }