From edb05572e8c25079cc75a93560092b35b75c81bb Mon Sep 17 00:00:00 2001
From: APriestman <apriestman@basistech.com>
Date: Fri, 29 May 2015 09:45:52 -0400
Subject: [PATCH] Catch case where Content is null

---
 Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
index 3223e29382..7e1dd9aa88 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
@@ -139,7 +139,7 @@ public final class ContentUtils {
                     return TimeZone.getDefault();
                 }
             }
-        } catch (TskException ex) {
+        } catch (TskException | NullPointerException ex) {
             return TimeZone.getDefault();
         }
     }