Don't use isset to check for !== null

Change-Id: I4e651e7194dc6254f23ddc0426e3f0aea6786166