Avoid NRE in install-from-ckan (fixes #2171)

KSP-CKAN · Dec 5, 2017 · 6702d9a · 6702d9a
1 parent 81d3f1a
commit 6702d9a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Cmdline/Action/Install.cs b/Cmdline/Action/Install.cs
@@ -65,7 +65,16 @@ public int RunCommand(CKAN.KSP ksp, object raw_options)
                     }
 
                     // Parse the JSON file.
-                    options.modules.Add(LoadCkanFromFile(ksp, filename).identifier);
+                    try
+                    {
+                        options.modules.Add(LoadCkanFromFile(ksp, filename).identifier);
+                    }
+                    catch (Kraken kraken)
+                    {
+                        user.RaiseError(kraken.InnerException == null
+                            ? kraken.Message
+                            : $"{kraken.Message}: {kraken.InnerException.Message}");
+                    }
                 }
 
                 // At times RunCommand() calls itself recursively - in this case we do

diff --git a/GUI/Main.cs b/GUI/Main.cs
@@ -934,7 +934,9 @@ private void installFromckanToolStripMenuItem_Click(object sender, EventArgs e)
                 }
                 catch (Kraken kraken)
                 {
-                    currentUser.RaiseError(kraken.Message + ": " + kraken.InnerException.Message);
+                    currentUser.RaiseError(kraken.InnerException == null
+                        ? kraken.Message
+                        : $"{kraken.Message}: {kraken.InnerException.Message}");
                     return;
                 }
                 catch (Exception ex)