From 83e7db8e504cf372c5253480326363b94e20064e Mon Sep 17 00:00:00 2001
From: Eric Oden <oden.eric@gmail.com>
Date: Fri, 15 Nov 2013 21:32:50 -0600
Subject: [PATCH] Make ENCOUNTER return null OrbitInfo with default values.

---
 Orbit.cs       | 49 ++++++++++++++++++++++++++-----------------------
 VesselUtils.cs |  2 +-
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/Orbit.cs b/Orbit.cs
index 3f328a8..6964c48 100644
--- a/Orbit.cs
+++ b/Orbit.cs
@@ -5,32 +5,35 @@
 
 namespace kOS
 {
-    public class OrbitInfo : SpecialValue
-    {
-        Orbit orbitRef;
+  public class OrbitInfo : SpecialValue
+  {
+    Orbit orbitRef;
 
-        public OrbitInfo(Orbit init)
-        {
-            this.orbitRef = init;
-        }
+    public OrbitInfo(Orbit init)
+    {
+      this.orbitRef = init;
+    }
 
-        public override object GetSuffix(string suffixName)
-        {
-            if (suffixName == "APOAPSIS") return orbitRef.ApA;
-            else if (suffixName == "PERIAPSIS") return orbitRef.PeA;
-            else if (suffixName == "BODY") return orbitRef.referenceBody.name;
+    public override object GetSuffix(string suffixName)
+    {
+      if (suffixName == "APOAPSIS")
+        return orbitRef != null ? orbitRef.ApA : 0;
+      else if (suffixName == "PERIAPSIS")
+        return orbitRef != null ? orbitRef.PeA : 0;
+      else if (suffixName == "BODY")
+        return orbitRef != null ? orbitRef.referenceBody.name : "None";
 
-            return base.GetSuffix(suffixName);
-        }
+      return base.GetSuffix(suffixName);
+    }
 
-        public override string ToString()
-        {
-            if (orbitRef != null)
-            {
-                return orbitRef.referenceBody.name;
-            }
+    public override string ToString()
+    {
+      if (orbitRef != null)
+      {
+        return orbitRef.referenceBody.name;
+      }
 
-            return "";
-        }
+      return "None";
     }
-}
+  }
+}
\ No newline at end of file
diff --git a/VesselUtils.cs b/VesselUtils.cs
index 94606ca..41ed760 100644
--- a/VesselUtils.cs
+++ b/VesselUtils.cs
@@ -262,7 +262,7 @@ public static object TryGetEncounter(Vessel vessel)
         }
       }
 
-      return "None";
+      return new OrbitInfo(null);
     }
 
     public static void LandingLegsCtrl(Vessel vessel, bool state)