better error handling in parser
merged
Merge branch 'master' of https://github.com/SL2Team/sl2