Merge "fix null pointer crash" into mnc-dev