Merge "Add more error codes."