From 039cb193904ff37d9402a01fa7925daea879045c Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Fri, 23 Mar 2018 18:11:44 -0400
Subject: [PATCH] 3632 fixed bug left over from 3562 where ingest had to be run
 once for unpack to work

---
 .../embeddedfileextractor/SevenZipExtractor.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
index 366247c461..c75b019876 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
@@ -560,8 +560,15 @@ class SevenZipExtractor {
             //initialize tree hierarchy to keep track of unpacked file structure
             SevenZipExtractor.UnpackedTree unpackedTree = new SevenZipExtractor.UnpackedTree(moduleDirRelative + "/" + uniqueArchiveFileName, archiveFile);
 
-            long freeDiskSpace = services.getFreeDiskSpace();
-
+            long freeDiskSpace;
+            try {
+                freeDiskSpace  = services.getFreeDiskSpace();
+            }
+            catch(NullPointerException ex) {            
+                //If ingest has not been run at least once getFreeDiskSpace() will throw a null pointer exception
+                //currently getFreeDiskSpace always returns DISK_FREE_SPACE_UNKNOWN
+                 freeDiskSpace = IngestMonitor.DISK_FREE_SPACE_UNKNOWN;
+            }
             //unpack and process every item in archive
             int itemNumber = 0;