Minor improvement: Add support for two more error codes