diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
index 8af4905638..520c4a7171 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
@@ -261,7 +261,7 @@ NewCaseVisualPanel1.singleUserCaseRadioButton.text=Single-user
 NewCaseVisualPanel1.multiUserSettingsWarningLabel.text=Multi-user settings warning label
 Case.deleteReports.deleteFromDiskException.log.msg=Unable to delete the report from the disk.
 Case.deleteReports.deleteFromDiskException.msg=Unable to delete the report {0} from the disk.\nYou may manually delete it from {1}
-CasePropertiesForm.lbDbType.text=Database Type:
+CasePropertiesForm.lbDbType.text=Case Type:
 CasePropertiesForm.tbDbType.text=
 CasePropertiesForm.lbDbName.text=Database Name:
 CasePropertiesForm.tbDbName.text=
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form
index 133475120c..94e9161756 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form
@@ -49,9 +49,9 @@
                       </Group>
                       <EmptySpace type="separate" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="caseNameTextField" alignment="0" pref="244" max="32767" attributes="1"/>
-                          <Component id="caseNumberTextField" alignment="0" pref="244" max="32767" attributes="1"/>
-                          <Component id="examinerTextField" alignment="0" pref="244" max="32767" attributes="1"/>
+                          <Component id="caseNameTextField" alignment="0" pref="245" max="32767" attributes="1"/>
+                          <Component id="caseNumberTextField" alignment="0" pref="245" max="32767" attributes="1"/>
+                          <Component id="examinerTextField" alignment="0" pref="245" max="32767" attributes="1"/>
                           <Component id="crDateTextField" alignment="0" max="32767" attributes="1"/>
                           <Component id="jScrollPane2" alignment="0" max="32767" attributes="0"/>
                           <Component id="tbDbType" alignment="0" max="32767" attributes="0"/>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
index 5c6df573da..99dcd8bfa2 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
@@ -79,7 +79,7 @@ class CasePropertiesForm extends javax.swing.JPanel {
     /**
      * Creates new form CasePropertiesForm
      */
-    CasePropertiesForm(Case currentCase, String crDate, String caseDir, Map<Long, String> imgPaths) {
+    CasePropertiesForm(Case currentCase, String crDate, String caseDir, Map<Long, String> imgPaths) throws CaseMetadata.CaseMetadataException {
         initComponents();
         caseNameTextField.setText(currentCase.getName());
         caseNumberTextField.setText(currentCase.getNumber());
@@ -88,18 +88,14 @@ class CasePropertiesForm extends javax.swing.JPanel {
         caseDirTextArea.setText(caseDir);
         current = currentCase;
 
-        try {
-            CaseMetadata caseMetadata = new CaseMetadata(Paths.get(currentCase.getConfigFilePath()));
-            tbDbName.setText(caseMetadata.getCaseDatabaseName());
-            Case.CaseType caseType = caseMetadata.getCaseType();
-            tbDbType.setText(caseType.toString());
-            if (caseType == Case.CaseType.SINGLE_USER_CASE) {
-                deleteCaseButton.setEnabled(true);
-            } else {
-                deleteCaseButton.setEnabled(false);
-            }
-        } catch (CaseMetadata.CaseMetadataException ex) {
-            Logger.getLogger(CasePropertiesForm.class.getName()).log(Level.WARNING, "Could not read case properties.", ex); //NON-NLS
+        CaseMetadata caseMetadata = new CaseMetadata(Paths.get(currentCase.getConfigFilePath()));
+        tbDbName.setText(caseMetadata.getCaseDatabaseName());
+        Case.CaseType caseType = caseMetadata.getCaseType();
+        tbDbType.setText(caseType.toString());
+        if (caseType == Case.CaseType.SINGLE_USER_CASE) {
+            deleteCaseButton.setEnabled(true);
+        } else {
+            deleteCaseButton.setEnabled(false);
         }
 
         int totalImages = imgPaths.size();
@@ -314,9 +310,9 @@ class CasePropertiesForm extends javax.swing.JPanel {
                             .addComponent(lbDbType))
                         .addGap(18, 18, 18)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(caseNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 244, Short.MAX_VALUE)
-                            .addComponent(caseNumberTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 244, Short.MAX_VALUE)
-                            .addComponent(examinerTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 244, Short.MAX_VALUE)
+                            .addComponent(caseNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 245, Short.MAX_VALUE)
+                            .addComponent(caseNumberTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 245, Short.MAX_VALUE)
+                            .addComponent(examinerTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 245, Short.MAX_VALUE)
                             .addComponent(crDateTextField)
                             .addComponent(jScrollPane2)
                             .addComponent(tbDbType)