diff --git a/src/main/java/com/reandroid/apk/ApkModule.java b/src/main/java/com/reandroid/apk/ApkModule.java
index cffd36360..9489fb80a 100644
--- a/src/main/java/com/reandroid/apk/ApkModule.java
+++ b/src/main/java/com/reandroid/apk/ApkModule.java
@@ -841,7 +841,7 @@ private void ensureLoadedManifestLinked() {
         }
         packageBlock = tableBlock.pickOne(manifestBlock.guessCurrentPackageId());
         if(packageBlock == null) {
-            packageBlock = tableBlock.pickOne();
+            packageBlock = tableBlock.pickOrEmptyPackage();
         }
         if(packageBlock != null) {
             manifestBlock.setPackageBlock(packageBlock);
diff --git a/src/main/java/com/reandroid/apk/ApkModuleXmlEncoder.java b/src/main/java/com/reandroid/apk/ApkModuleXmlEncoder.java
index 4bf26fb80..6029db317 100644
--- a/src/main/java/com/reandroid/apk/ApkModuleXmlEncoder.java
+++ b/src/main/java/com/reandroid/apk/ApkModuleXmlEncoder.java
@@ -82,7 +82,7 @@ private void encodeManifestXml(File mainDirectory) {
         if(packageId != null){
             packageBlock = tableBlock.pickOne(packageId);
         }else {
-            packageBlock = tableBlock.pickOne();
+            packageBlock = tableBlock.pickOrEmptyPackage();
         }
         if(packageBlock != null){
             tableBlock.setCurrentPackage(packageBlock);