diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e7f94ca..58328995 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Only listing significant user-visible, not internal code cleanups and minor bug
 ## 0.2.0 (February 08, 2019)
 
 * Update upstream toree to 0.3.0-incubating
+* Do not crash interpreter when receiving a code error
 
 ## 0.1.0-491c615 (Built: September 03, 2018 | Released: September 14, 2018)
 
diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
index bbb7e43a..0caf45fc 100644
--- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
+++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
@@ -339,8 +339,8 @@ class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends I
          lastResultOut.reset()
 
          val (obj, defStr, text) = prepareResult(lastOutput, KernelOptions.showTypes, KernelOptions.noTruncation, KernelOptions.showOutput )
-         defStr.foreach(kernel.display.content(MIMEType.PlainText, _))
-         text.foreach(kernel.display.content(MIMEType.PlainText, _))
+         // defStr.foreach(kernel.display.content(MIMEType.PlainText, _))
+         // text.foreach(kernel.display.content(MIMEType.PlainText, _))
          val output = obj.map(Displayers.display(_).asScala.toMap).getOrElse(Map.empty)
          (result, Left(output))
 
@@ -348,9 +348,9 @@ class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends I
          val lastOutput = lastResultOut.toString("UTF-8").trim
          lastResultOut.reset()
 
-         val (obj, defStr, text) = prepareResult(lastOutput)
+         val (obj, defStr, text) = prepareResult(lastOutput, KernelOptions.showTypes, KernelOptions.noTruncation, true)
          defStr.foreach(kernel.display.content(MIMEType.PlainText, _))
-         val output = interpretConstructExecuteError(text.get)
+         val output = interpretConstructExecuteError(text.getOrElse(""))
          (Results.Error, Right(output))
 
        case Results.Aborted =>