Additional exception handling and error messages