more ErrorStatement recovery
Merge pull request #4017 from WalterBright/error-statement

more ErrorStatement recovery