Fix NotFoundException warnings