Add some more error handling.