Added in some error handling for not found resources