diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExtractOvaCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExtractOvaCommand.java
index bbab14ca4a9..95a604efdc8 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExtractOvaCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExtractOvaCommand.java
@@ -238,11 +238,11 @@ private void storeExternalData(String stdout) {
                 .filter(s -> !StringUtils.isEmpty(s)).map(s -> s.split("=", 2))
                 .collect(Collectors.toMap(part -> part[0], part -> new SecretValue<String>(part[1])));
         SecretValue<String> tpmData = externalData.get("tpm");
-        if (!StringUtils.isEmpty(tpmData.getValue())) {
+        if (tpmData != null && !StringUtils.isEmpty(tpmData.getValue())) {
             vmDao.updateTpmData(getVmId(), tpmData, null);
         }
         SecretValue<String> nvramData = externalData.get("nvram");
-        if (!StringUtils.isEmpty(nvramData.getValue())) {
+        if (nvramData != null && !StringUtils.isEmpty(nvramData.getValue())) {
             vmDao.updateNvramData(getVmId(), nvramData, null);
         }
     }