diff --git a/src/main/scala/leon/evaluators/CodeGenEvaluator.scala b/src/main/scala/leon/evaluators/CodeGenEvaluator.scala
index d75e0f08b9741539faad1a3c4943183c0053f233..e13a0d216adee3ecd5017d3449fb3ed3f4d4569a 100644
--- a/src/main/scala/leon/evaluators/CodeGenEvaluator.scala
+++ b/src/main/scala/leon/evaluators/CodeGenEvaluator.scala
@@ -58,6 +58,9 @@ class CodeGenEvaluator(ctx : LeonContext, val unit : CompilationUnit) extends Ev
 
           case e : java.lang.ExceptionInInitializerError =>
             EvaluationResults.RuntimeError(e.getException.getMessage) 
+          
+          case so : java.lang.StackOverflowError =>
+            EvaluationResults.RuntimeError("Stack overflow")
 
         }
       })