Improve error handling specs.