Merge pull request #43 from christav/master

Handling parse errors without crashing