2 files changed, 8 insertions, 2 deletions
diff --git a/src/main/com/jantuomi/tunkki/core/parser/ast/CallNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/CallNode.java
index be3f0be..ed534a2 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/ast/CallNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/CallNode.java
@@ -17,7 +17,14 @@ public class CallNode extends SymbolNode {
     public Datatype evaluate() throws TunkkiError {
         Datatype d = super.evaluate();
         if (d.getType() == Datatype.Type.Callable) {
-            return ((CallableDatatype) d).call(evaluateParameters());
+            try {
+                Datatype r = ((CallableDatatype) d).call(evaluateParameters());
+                return r;
+            }
+            catch (TunkkiError ex) {
+                ex.setLine(getLine());
+                throw ex;
+            }
         } else {
             return d;
         }
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/Function.java b/src/main/com/jantuomi/tunkki/core/runtime/Function.java
index b104dd0..4b08a80 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/Function.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/Function.java
@@ -12,7 +12,6 @@ import java.util.List;
 public class Function {
 
     private List<String> argumentNames;
-
     private BlockBodyNode body;
 
     public String getName() {