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

:expressionless::gun:

Didn't see that. In that case, please proceed. :smile: