Made error messages more uniform.