Merge "Fix a potential NPE" into main