SLIDER-122 Check against null is missing in some classes