added error handling for other resources