TA-35 - Prevent NullPointerException in ModelImport