Merge "Fix NPE." into main