Fix regression. Added defensive code
Fix regression. Added defensive code

sharkkid/kanzi,rukistar/kanzi,rukistar/kanzi,rukistar/kanzi,sharkkid/kanzi,Sputuks3/kanzi,sharkkid/kanzi,Sputuks3/kanzi,Sputuks3/kanzi,rzel/kanzi,rzel/kanzi,rzel/kanzi