Remove null pointer dereferences from #300#310

YggdrasiI wants to merge 1 commit intodavidmoreno:masterdavidmoreno/onion:masterfrom

YggdrasiI:issue_300YggdrasiI/onion:issue_300Copy head branch name to clipboard