Revert "Revert "cleaned up some failure condition issues with process""

This reverts commit 3af960e7d1c369da59bb3bd812a9bc565048569b.