diff --git a/static/item_updater_static.cpp b/static/item_updater_static.cpp
index 140d5cc..e4708dd 100644
--- a/static/item_updater_static.cpp
+++ b/static/item_updater_static.cpp
@@ -218,6 +218,12 @@
     const auto& [version, extendedVersion] = Version::getVersions(fullVersion);
     auto id = Version::getId(version);
 
+    if (id.empty())
+    {
+        // Possibly a corrupted PNOR
+        return;
+    }
+
     auto activationState = server::Activation::Activations::Active;
     if (version.empty())
     {
@@ -347,7 +353,8 @@
             return erase(iter.second->versionId);
         }
     }
-    return false;
+    // No active PNOR means PNOR is empty or corrupted
+    return true;
 }
 
 void ItemUpdaterStatic::updateFunctionalAssociation(
diff --git a/version.cpp b/version.cpp
index d9ad395..c6e43fc 100644
--- a/version.cpp
+++ b/version.cpp
@@ -30,8 +30,7 @@
     if (version.empty())
     {
         log<level::ERR>("Error version is empty");
-        elog<InvalidArgument>(Argument::ARGUMENT_NAME("Version"),
-                              Argument::ARGUMENT_VALUE(version.c_str()));
+        return {};
     }
 
     unsigned char digest[SHA512_DIGEST_LENGTH];