More error message cleanup