added function name to error output
fixed source parsing
+1