Don't use isset() to check for null

Fixes in maintenance/

Change-Id: I300a2a0cb240cb3f9c1d0c76d4575f93e9706b59
Merge "Don't use isset() to check for null"