refactor error handling
some adjustments for syntax errors
Merge branch 'bettererrorhandling'
bump version