Bug 1007774 - Part 2: fix undefined/null error found with hamachi.
Merge pull request #22893 from hfiguiere/bug1007774

Bug 1007774 - Part 2: fix undefined/null error found with hamachi. r=eli