- Fix error reporting
- Allow the error phase to support multiple commands