From f11fe15926a5eb012a420c53a11bc5329aa0bc45 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Mon, 27 Oct 2014 13:50:24 -0400
Subject: [PATCH] Fixed NPE when adding local disk

---
 .../autopsy/casemodule/LocalDiskPanel.java         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
index e90918ff09..00accf4e3e 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
@@ -419,12 +419,14 @@ final class LocalDiskPanel extends JPanel {
                 label.setForeground(list.getForeground());
             }
 
-            String localDiskString = value.toString();
-            label.setText(value.toString());
-            if ((localDiskString.equals(LOADING)) || (localDiskString.equals(NO_DRIVES))) {
-                label.setFont(label.getFont().deriveFont(Font.ITALIC));
-                label.setBackground(Color.GRAY);
-            } 
+            if (value != null) {
+                String localDiskString = value.toString();
+                label.setText(value.toString());
+                if ((localDiskString.equals(LOADING)) || (localDiskString.equals(NO_DRIVES))) {
+                    label.setFont(label.getFont().deriveFont(Font.ITALIC));
+                    label.setBackground(Color.GRAY);
+                }
+            }
             label.setOpaque(true);
             label.setBorder(new EmptyBorder(2, 2, 2, 2));