Remove unnecessary double null/undefined check

Reviewer: lisa