Adding !== undefined checks.