Merge "Add support for handling multiple error codes"