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