[BUGFIX] Proper error handling of ResourceDoesNotExistException