Handle non-convergence and maximum number of iterations

For details see NEWS.md