KT-3750 When without else

 #KT-3750 Fixed