Merge "Add missing null check" into pi-dev