DF-4895 add else-break