Revert changes to null-check, was correct the first time.

Signed-off-by: Michael Ikey Doherty <michael.i.doherty@intel.com>