Merge "Fix a rare null reference exception"