diff --git a/Core/src/org/sleuthkit/autopsy/report/CreatePortableCaseModule.java b/Core/src/org/sleuthkit/autopsy/report/CreatePortableCaseModule.java
index 3ce5c3a369..b0db1d0b46 100644
--- a/Core/src/org/sleuthkit/autopsy/report/CreatePortableCaseModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/CreatePortableCaseModule.java
@@ -708,14 +708,18 @@ public class CreatePortableCaseModule implements GeneralReportModule {
         oldIdToNewContent.clear();
         newIdToContent.clear();
         oldTagNameToNewTagName.clear();
+        oldArtTypeIdToNewArtTypeId.clear();
+        oldAttrTypeIdToNewAttrType.clear();
+        oldArtifactIdToNewArtifact.clear();
+        
         currentCase = null;
         if (portableSkCase != null) {
             portableSkCase.close();
+            portableSkCase = null;
         }
         caseFolder = null;
         copiedFilesFolder = null;
     }
-    
 
     @Override
     public JPanel getConfigurationPanel() {