More error handling clean ups