fix on error parsing
Merge pull request #135 from Caraxe/upstream

fix on error parsing [applied after resync]