Parsing error handling fixed
Bug with undefined functions fixed