Improve error-checking.