Merge "Don't crash on NameNotFoundException" into mnc-dev