[[ RefactorSyntax ]] Fixes emptiness and null-ness of variable, which now exactly follows the 6.x engine definitions