diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java
index c1966cb067..539f98d896 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java
@@ -180,7 +180,9 @@ public class OsAccountDataPanel extends JPanel {
         data.addData(Bundle.OsAccountDataPanel_basic_address(),
                 account.getName() == null || account.getName().isEmpty() ? "" : account.getName());
 
-        data.addData(Bundle.OsAccountDataPanel_basic_type(), account.getOsAccountType().getName());
+        
+        data.addData(Bundle.OsAccountDataPanel_basic_type(), 
+            account.getOsAccountType().isPresent() ? account.getOsAccountType().get().getName() : "");
 
         Optional<Long> crTime = account.getCreationTime();
         if (crTime.isPresent()) {