diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs
index 3cecc53..cc3d8a6 100644
--- a/DS_Map/Main Window.Designer.cs	
+++ b/DS_Map/Main Window.Designer.cs	
@@ -2842,7 +2842,7 @@
             // 
             // saveEventsButton
             // 
-            this.saveEventsButton.Enabled = false;
+            this.saveEventsButton.Enabled = true;
             this.saveEventsButton.Location = new System.Drawing.Point(8, 31);
             this.saveEventsButton.Name = "saveEventsButton";
             this.saveEventsButton.Size = new System.Drawing.Size(117, 22);
diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs
index 5cc6f9a..4277a4b 100644
--- a/DS_Map/Main Window.cs	
+++ b/DS_Map/Main Window.cs	
@@ -1243,24 +1243,27 @@ namespace DSPRE {
             if (disableHandlers) return;
            
             string imageName;
-            switch (gameVersion)
-            {
-                case "Diamond":
-                case "Pearl":
-                    currentHeader.camera = (byte)cameraComboBox.SelectedIndex;
-                    imageName = "dpcamera" + cameraComboBox.SelectedIndex.ToString();
-                    break;
-                case "Platinum":
-                    currentHeader.camera = (byte)cameraComboBox.SelectedIndex;
-                    imageName = "ptcamera" + cameraComboBox.SelectedIndex.ToString();
-                    break;
-                default:
-                    currentHeader.camera = Byte.Parse(cameraComboBox.SelectedItem.ToString().Substring(1, 3));
-                    imageName = "hgsscamera" + currentHeader.camera.ToString("D3");
-                    break;
+            try {
+                switch (gameVersion)
+                {
+                    case "Diamond":
+                    case "Pearl":
+                        currentHeader.camera = (byte)cameraComboBox.SelectedIndex;
+                        imageName = "dpcamera" + cameraComboBox.SelectedIndex.ToString();
+                        break;
+                    case "Platinum":
+                        currentHeader.camera = (byte)cameraComboBox.SelectedIndex;
+                        imageName = "ptcamera" + cameraComboBox.SelectedIndex.ToString();
+                        break;
+                    default:
+                        currentHeader.camera = Byte.Parse(cameraComboBox.SelectedItem.ToString().Substring(1, 3));
+                        imageName = "hgsscamera" + currentHeader.camera.ToString("D3");
+                        break;
+                }
+                cameraPictureBox.Image = (Image)Properties.Resources.ResourceManager.GetObject(imageName);
+            } catch (NullReferenceException) {
+                MessageBox.Show("The current header uses an unrecognized camera.\nThis is not a problem. Settings will be saved normally.", "Unknown camera settings", MessageBoxButtons.OK, MessageBoxIcon.Warning);
             }
-
-            cameraPictureBox.Image = (Image)Properties.Resources.ResourceManager.GetObject(imageName);
         }
         private void eventFileUpDown_ValueChanged(object sender, EventArgs e)
         {
@@ -1643,7 +1646,8 @@ namespace DSPRE {
         }
         private void headersGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
         {
-            if (disableHandlers) return;
+            if (disableHandlers) 
+                return;
             if (e.RowIndex > -1 && e.ColumnIndex > -1)
             {
                 /* If input is junk, use 0000 as placeholder value */
@@ -1689,7 +1693,8 @@ namespace DSPRE {
         }
         private void heightsGridView_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
         {
-            if (e.Value == null) return;
+            if (e.Value == null) 
+                return;
             disableHandlers = true;
 
             /* Format table cells corresponding to border maps or void */
@@ -3169,8 +3174,7 @@ namespace DSPRE {
             if (eventMatrixXUpDown.Value > eventMatrix.width || eventMatrixYUpDown.Value > eventMatrix.height) {
                 String errorMsg = "This event file contains elements located on an unreachable map, beyond the current matrix.\n" +
                     "It is strongly advised that you bring every Overworld, Spawnable, Warp and Trigger of this event to a map that belongs to the matrix's range.";
-                DialogResult d;
-                d = MessageBox.Show(errorMsg, "Can't load proper map", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                MessageBox.Show(errorMsg, "Can't load proper map", MessageBoxButtons.OK, MessageBoxIcon.Warning);
             }
             else {
                 mapIndex = eventMatrix.maps[(int)(eventMatrixYUpDown.Value), (int)(eventMatrixXUpDown.Value)];
@@ -4894,7 +4898,7 @@ namespace DSPRE {
         private void addStringButton_Click(object sender, EventArgs e)
         {
             currentMessageFile.messages.Add("");
-            textEditorDataGridView.Rows.Add("");
+            textEditorDataGridView.Rows.Add(textEditorDataGridView.RowCount+1);
         }
         private void exportTextFileButton_Click(object sender, EventArgs e)
         {
@@ -5089,8 +5093,10 @@ namespace DSPRE {
         }
         private void textEditorDataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
         {
-            if (disableHandlers) return;
-            if (e.RowIndex > -1) currentMessageFile.messages[e.RowIndex] = textEditorDataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
+            if (disableHandlers) 
+                return;
+            if (e.RowIndex > -1) 
+                currentMessageFile.messages[e.RowIndex] = textEditorDataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
         }
 
         #endregion
diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx
index 743620f..e1e2174 100644
--- a/DS_Map/Main Window.resx	
+++ b/DS_Map/Main Window.resx	
@@ -416,7 +416,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA
-        DwAAAk1TRnQBSQFMAgEBBwEAAQgBAgEIAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DwAAAk1TRnQBSQFMAgEBBwEAARABAgEQAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA