fix I-107558

improve null/zero checking