CON-999: Changed break into continue