diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form
index 5f56ca13f7..6ff2b5f906 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form
@@ -85,7 +85,7 @@
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Component id="containerPanel" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="40" max="32767" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
               <Component id="nextLabel" min="-2" max="-2" attributes="0"/>
           </Group>
       </Group>
@@ -200,7 +200,7 @@
         <Container class="javax.swing.JPanel" name="typePanel">
           <Properties>
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[0, 45]"/>
+              <Dimension value="[0, 60]"/>
             </Property>
           </Properties>
 
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java
index 0b796ed07b..8e0c6ed558 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java
@@ -232,7 +232,7 @@ final class AddImageVisualPanel1 extends JPanel {
 
         timeZoneComboBox.setMaximumRowCount(30);
 
-        typePanel.setMinimumSize(new java.awt.Dimension(0, 45));
+        typePanel.setMinimumSize(new java.awt.Dimension(0, 60));
 
         javax.swing.GroupLayout typePanelLayout = new javax.swing.GroupLayout(typePanel);
         typePanel.setLayout(typePanelLayout);
@@ -338,7 +338,7 @@ final class AddImageVisualPanel1 extends JPanel {
                     .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 6, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(containerPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 40, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addComponent(nextLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
         );
     }// </editor-fold>//GEN-END:initComponents
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
index 9fb000d45c..ff52859306 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
@@ -135,3 +135,4 @@ AddImageVisualPanel1.timeZoneLabel.text=Please select the image timezone:
 AddImageVisualPanel1.noFatOrphansCheckbox.toolTipText=
 AddImageVisualPanel1.noFatOrphansCheckbox.text=Ignore orphan files in FAT file systems
 MissingImageDialog.cancelButton.text=Cancel
+LocalDiskPanel.errorLabel.text=Error Label
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form
index a76c4051ae..383225ed36 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form
@@ -3,10 +3,10 @@
 <Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>
     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[0, 43]"/>
+      <Dimension value="[0, 60]"/>
     </Property>
     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[485, 43]"/>
+      <Dimension value="[485, 60]"/>
     </Property>
   </Properties>
   <AuxValues>
@@ -28,6 +28,7 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Component id="diskLabel" min="-2" max="-2" attributes="0"/>
                   <Component id="diskComboBox" min="-2" pref="345" max="-2" attributes="0"/>
+                  <Component id="errorLabel" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace min="0" pref="140" max="32767" attributes="0"/>
           </Group>
@@ -39,6 +40,8 @@
               <Component id="diskLabel" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="diskComboBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="errorLabel" min="-2" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -58,5 +61,15 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JLabel" name="errorLabel">
+      <Properties>
+        <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+          <Color blue="0" green="0" red="ff" type="rgb"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="LocalDiskPanel.errorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
index 3984b7c34f..f926b379be 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
@@ -58,9 +58,15 @@ public class LocalDiskPanel extends ImageTypePanel {
      * Update the JComboBox with the list of disks.
      */
     private void updateDisks() {
+        errorLabel.setText("");
         disks = new ArrayList<LocalDisk>();
-        disks.addAll(PlatformUtil.getPhysicalDrives());
-        disks.addAll(PlatformUtil.getPartitions());
+        List<LocalDisk> physical = PlatformUtil.getPhysicalDrives();
+        List<LocalDisk> local = PlatformUtil.getPartitions();
+        if(physical.isEmpty()) {
+            errorLabel.setText("Warning: You do not have the proper permissions to access your computer's physical drives.");
+        }
+        disks.addAll(physical);
+        disks.addAll(local);
         model = new LocalDiskModel();
         diskComboBox.setModel(model);
         diskComboBox.setSelectedIndex(0);
@@ -77,12 +83,16 @@ public class LocalDiskPanel extends ImageTypePanel {
 
         diskLabel = new javax.swing.JLabel();
         diskComboBox = new javax.swing.JComboBox();
+        errorLabel = new javax.swing.JLabel();
 
-        setMinimumSize(new java.awt.Dimension(0, 43));
-        setPreferredSize(new java.awt.Dimension(485, 43));
+        setMinimumSize(new java.awt.Dimension(0, 60));
+        setPreferredSize(new java.awt.Dimension(485, 60));
 
         org.openide.awt.Mnemonics.setLocalizedText(diskLabel, org.openide.util.NbBundle.getMessage(LocalDiskPanel.class, "LocalDiskPanel.diskLabel.text")); // NOI18N
 
+        errorLabel.setForeground(new java.awt.Color(255, 0, 0));
+        org.openide.awt.Mnemonics.setLocalizedText(errorLabel, org.openide.util.NbBundle.getMessage(LocalDiskPanel.class, "LocalDiskPanel.errorLabel.text")); // NOI18N
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -90,7 +100,8 @@ public class LocalDiskPanel extends ImageTypePanel {
             .addGroup(layout.createSequentialGroup()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(diskLabel)
-                    .addComponent(diskComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 345, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(diskComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 345, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(errorLabel))
                 .addGap(0, 140, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
@@ -98,12 +109,15 @@ public class LocalDiskPanel extends ImageTypePanel {
             .addGroup(layout.createSequentialGroup()
                 .addComponent(diskLabel)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(diskComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addComponent(diskComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(errorLabel))
         );
     }// </editor-fold>//GEN-END:initComponents
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JComboBox diskComboBox;
     private javax.swing.JLabel diskLabel;
+    private javax.swing.JLabel errorLabel;
     // End of variables declaration//GEN-END:variables
 
     /**