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

Sorry, what I'm saying is: only the line change from 61 is necessary and will catch any problems, even if you leave line 60 alone.