[BUGFIX] Catch freshly introduced ResourceDoesNotExistException