Merge "Readd missing null check"