Merge "Fix potential null pointer exception" into main