CYKLO-945: guard against undefined state
release 2.24.6