NXP-11028 fix NPE in modelImporter + additional issues found while testing