More error handling cleanups.