Don't use isset() to check whether an existing variable is null

Change-Id: I05ad172f69189cbef86c65d5990e76edbedfd7c6
Merge "Don't use isset() to check whether an existing variable is null"