More checking and more error handling.