Reverted - test for null return, not undefined