Changes to include restart and minor error message change