Improve error handling and test coverage.