diff --git a/core/src/main/scala/spark/LocalScheduler.scala b/core/src/main/scala/spark/LocalScheduler.scala
index c86b967aa551da247ec0424e485231a6b4c11423..c675eb54626b60d275b8457ba0ce186be7690c65 100644
--- a/core/src/main/scala/spark/LocalScheduler.scala
+++ b/core/src/main/scala/spark/LocalScheduler.scala
@@ -58,7 +58,8 @@ private class LocalScheduler(threads: Int, maxFailures: Int) extends DAGSchedule
               submitTask(task, idInJob)
             } else {
               // TODO: Do something nicer here to return all the way to the user
-              System.exit(1)
+              //System.exit(1)
+              taskEnded(task, new ExceptionFailure(t), null, null)
             }
           }
         }