diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED
index f03f55df38..173fbf513d 100644
--- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED
@@ -3,6 +3,7 @@ AnalysisPanel_keyColumn_title=Name
 AnalysisPanel_keywordSearchModuleName=Keyword Search
 # {0} - module name
 BaseDataSourceSummaryPanel_defaultNotIngestMessage=The {0} ingest module has not been run on this data source.
+ContainerPanel_setFieldsForNonImageDataSource_na=N/A
 CTL_DataSourceSummaryAction=Data Source Summary
 DataSourceSummaryDialog.closeButton.text=Close
 ContainerPanel.displayNameLabel.text=Display Name:
diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/ContainerPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/ContainerPanel.java
index a852a0b886..bc331d952b 100644
--- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/ContainerPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/ContainerPanel.java
@@ -26,6 +26,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.table.DefaultTableModel;
+import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.datasourcesummary.datamodel.ContainerSummary;
 import org.sleuthkit.autopsy.datasourcesummary.uiutils.DataFetchResult.ResultType;
@@ -52,7 +53,7 @@ class ContainerPanel extends BaseDataSourceSummaryPanel {
         /**
          * Main constructor.
          *
-         * @param dataSource           The original datasource.
+         * @param dataSource The original datasource.
          * @param unallocatedFilesSize The unallocated file size.
          */
         ContainerPanelData(DataSource dataSource, Long unallocatedFilesSize) {
@@ -165,8 +166,6 @@ class ContainerPanel extends BaseDataSourceSummaryPanel {
     private void updateDetailsPanelData(DataSource selectedDataSource, Long unallocatedFilesSize) {
         clearTableValues();
         if (selectedDataSource != null) {
-            unallocatedSizeValue.setText(SizeRepresentationUtil.getSizeString(unallocatedFilesSize));
-            timeZoneValue.setText(selectedDataSource.getTimeZone());
             displayNameValue.setText(selectedDataSource.getName());
             originalNameValue.setText(selectedDataSource.getName());
             deviceIdValue.setText(selectedDataSource.getDeviceId());
@@ -178,24 +177,48 @@ class ContainerPanel extends BaseDataSourceSummaryPanel {
             }
 
             if (selectedDataSource instanceof Image) {
-                setFieldsForImage((Image) selectedDataSource);
+                setFieldsForImage((Image) selectedDataSource, unallocatedFilesSize);
+            } else {
+                setFieldsForNonImageDataSource();
             }
         }
-        
+
         this.repaint();
     }
 
+    @Messages({
+        "ContainerPanel_setFieldsForNonImageDataSource_na=N/A"
+    })
+    private void setFieldsForNonImageDataSource() {
+        String NA = Bundle.ContainerPanel_setFieldsForNonImageDataSource_na();
+
+        unallocatedSizeValue.setText(NA);
+        imageTypeValue.setText(NA);
+        sizeValue.setText(NA);
+        sectorSizeValue.setText(NA);
+        timeZoneValue.setText(NA);
+
+        ((DefaultTableModel) filePathsTable.getModel()).addRow(new Object[]{NA});
+
+        md5HashValue.setText(NA);
+        sha1HashValue.setText(NA);
+        sha256HashValue.setText(NA);
+    }
+
     /**
      * Sets text fields for an image. This should be called after
      * clearTableValues and before updateFieldVisibility to ensure the proper
      * rendering.
      *
      * @param selectedImage The selected image.
+     * @param unallocatedFilesSize Unallocated file size in bytes.
      */
-    private void setFieldsForImage(Image selectedImage) {
+    private void setFieldsForImage(Image selectedImage, Long unallocatedFilesSize) {
+        unallocatedSizeValue.setText(SizeRepresentationUtil.getSizeString(unallocatedFilesSize));
         imageTypeValue.setText(selectedImage.getType().getName());
         sizeValue.setText(SizeRepresentationUtil.getSizeString(selectedImage.getSize()));
         sectorSizeValue.setText(SizeRepresentationUtil.getSizeString(selectedImage.getSsize()));
+        timeZoneValue.setText(selectedImage.getTimeZone());
 
         for (String path : selectedImage.getPaths()) {
             ((DefaultTableModel) filePathsTable.getModel()).addRow(new Object[]{path});