diff --git a/lib/core/parser/parser.dart b/lib/core/parser/parser.dart
index e86a503cd..da9c30e23 100644
--- a/lib/core/parser/parser.dart
+++ b/lib/core/parser/parser.dart
@@ -117,6 +117,8 @@ class _UnwrapExceptionDecorator extends Expression {
       return _expression.eval(scope, formatters);
     } on EvalError catch (e, s) {
       throw e.unwrap("$this", s);
+    } catch (e, s) {
+      throw new EvalError(e.toString()).unwrap("$this", s);
     }
   }