Cleanup and an NPE fix.
Chaging the restart methods.