Apply handle pattern to scan#379

jdalton merged 2 commits intomainSocketDev/socket-cli:mainfrom

split_scanSocketDev/socket-cli:split_scanCopy head branch name to clipboard