diff --git a/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java b/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java
index 343212d1da53494aca2c2cf476df7a8fc5fda2b3..7e8730494b5ba824a05952745ef99065c5908a29 100644
--- a/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java
+++ b/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java
@@ -133,11 +133,11 @@ public abstract class ImportExportHandlerBase implements ImportExportHandler {
         dependencyList.add(dependencyVo);
         ImportExportVo importExportVo = importExportHandler.exportData(primaryKey, dependencyList, zipOutputStream);
         if (importExportVo != null) {
-            if (logger.isWarnEnabled()) {
-                logger.warn("export data: " + importExportVo.getType() + "-" + importExportVo.getName() + "-" + importExportVo.getPrimaryKey());
-            }
             dependencyVo.setName(importExportVo.getName());
             if (zipOutputStream != null) {
+                if (logger.isWarnEnabled()) {
+                    logger.warn("export data: " + importExportVo.getType() + "-" + importExportVo.getName() + "-" + importExportVo.getPrimaryKey());
+                }
                 try {
                     zipOutputStream.putNextEntry(new ZipEntry("dependency-folder/" + importExportVo.getPrimaryKey() + ".json"));
                     zipOutputStream.write(JSONObject.toJSONBytes(importExportVo));
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/FileImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/FileImportExportHandler.java
index 42644506da3860421881c6164d7cf7af509e5732..a6c22f79f5b62e5e1e01b030c69011ee25eb49d3 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/FileImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/FileImportExportHandler.java
@@ -96,14 +96,16 @@ public class FileImportExportHandler extends ImportExportHandlerBase {
                 while ((len = in.read(buf)) != -1) {
                     out.write(buf, 0, len);
                 }
-                zipOutputStream.putNextEntry(new ZipEntry("attachment-folder/" + fileVo.getId() + "/" + fileVo.getName()));
-                zipOutputStream.write(out.toByteArray());
-                zipOutputStream.closeEntry();
-                in.close();
-                out.reset();
-            }
-            if (logger.isWarnEnabled()) {
-                logger.warn("export file: " + fileVo.getName());
+                if (zipOutputStream != null) {
+                    zipOutputStream.putNextEntry(new ZipEntry("attachment-folder/" + fileVo.getId() + "/" + fileVo.getName()));
+                    zipOutputStream.write(out.toByteArray());
+                    zipOutputStream.closeEntry();
+                    in.close();
+                    out.reset();
+                    if (logger.isWarnEnabled()) {
+                        logger.warn("export file: " + fileVo.getName());
+                    }
+                }
             }
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
index 274968ba7cbc1b4d0409a1cfb4c7344f615be003..e5bd4f83bcf0c5d89f9fac0eb2cfea0438e56a90 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
@@ -103,7 +103,7 @@ public class MatrixImportExportHandler extends ImportExportHandlerBase {
         if (Objects.equals(matrix.getType(), "external")) {
             doExportData(FrameworkImportExportHandlerType.INTEGRATION, matrixVo.getIntegrationUuid(), dependencyList, zipOutputStream);
         } else if (Objects.equals(matrix.getType(), "cmdbci")) {
-            doExportData(FrameworkImportExportHandlerType.CMDB_CI, matrixVo.getId(), dependencyList, zipOutputStream);
+            doExportData(FrameworkImportExportHandlerType.CMDB_CI, matrixVo.getCiId(), dependencyList, zipOutputStream);
         }
         ImportExportVo importExportVo = new ImportExportVo(this.getType().getValue(), primaryKey, matrixVo.getLabel());
         importExportVo.setDataWithObject(matrixVo);