Manually fix up error handling.