Improve error checking.