Fix solver restart counter.

This PR fixes a small issue with the solver restart counter not beeing reset after the solver converged again. Also, the time step does only grow moderately after a solver restart.

In addition I changed the caught exceptions to const reference as suggested by bska.