Updated parser error types
auto-merge staging into master