diff --git a/MissionCompletedEntry.cs b/MissionCompletedEntry.cs
index 6f9473f..46c843b 100644
--- a/MissionCompletedEntry.cs
+++ b/MissionCompletedEntry.cs
@@ -14,7 +14,6 @@ namespace EDJournal {
         private int id = 0;
 
         protected override void Initialise() {
-            MakeHumanReadableName();
             id = JSON.Value<int?>("MissionID") ?? 0;
             name = JSON.Value<string>("Name");
             if (JSON.ContainsKey("Commodity_Localised")) {
@@ -26,6 +25,8 @@ namespace EDJournal {
             if (JSON.ContainsKey("Donated")) {
                 donated = JSON.Value<int>("Donated");
             }
+
+            MakeHumanReadableName();
         }
 
         public string Name => name;
@@ -34,7 +35,7 @@ namespace EDJournal {
         public int MissionID => id;
 
         private void MakeHumanReadableName() {
-            if (readable_name != null) {
+            if (readable_name != null || Name == null) {
                 return;
             }