ignoring exit code for restart
cleaning up
fixing throw merge