Fixed orphaned nodes blocking resume & nil pointer crash#327

Pranav-1100 wants to merge 2 commits intostoracha:mainstoracha/guppy:mainfrom

Pranav-1100:orphaned-nodesPranav-1100/guppy:orphaned-nodesCopy head branch name to clipboard