Merge "Fix NPE." into mnc-dev