Added more error codes