Minor clean up
Subproccess exception handling