small changes to ensure handle closure & dir deletion#4

patrickjburke245 merged 4 commits intopatrickjburke245:mainpatrickjburke245/pull-request-generator:mainfrom

neilcar:defer-fixneilcar/pull-request-generator:defer-fixCopy head branch name to clipboard