Removed custom error handling