Added backward compatibility in NonConvergingHandler