Add some more corrected error handling.