Merge "Fix null deref" into mnc-dev