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

Change-Id: I7b4207e91b6fa33ba31b1308f5e71f923def687e