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

Regardless, having a null value will still keep the modified if statement from proceeding.