More error message polish