Fix crash with NotFoundException