code more defensively for bad product WEB-6276