Reduce panic-driven internal control flow#6

AlexandreYang merged 2 commits intomainDataDog/rshell:mainfrom

dd/reduce-panic-internal-control-flowDataDog/rshell:dd/reduce-panic-internal-control-flowCopy head branch name to clipboard