Merge "Improve error handling with separate ICanErrorListener"