revert to old behaviour w.r.t. max iterations (i.e. throw an exception)