Potential fixes for error handling issues.