More error handling done.