Adding custom error handling