Fix non-converging error.
Added backward compatibility in NonConvergingHandler