Improved error codes.