Error handler setup changes
More error handling cleanup