Cleaning up some old error handling code.