diff --git a/aman/sys/RecedingHorizonControl.py b/aman/sys/RecedingHorizonControl.py
index 7266a54..0906964 100644
--- a/aman/sys/RecedingHorizonControl.py
+++ b/aman/sys/RecedingHorizonControl.py
@@ -113,7 +113,7 @@ class RecedingHorizonControl:
         # search from the back to the front to find the last inbound
         for i in range(min(self.FreezedIndex, len(self.Windows)), -1, -1):
             for inbound in self.Windows[i].Inbounds:
-                if runway == inbound.PlannedRunway.Name:
+                if None != inbound.PlannedRunway and runway == inbound.PlannedRunway.Name:
                     return inbound
 
         # no inbound found
@@ -121,7 +121,7 @@ class RecedingHorizonControl:
 
     def optimizationRelevantInbounds(self):
         # no new inbounds
-        if len(self.Windows) <= self.FreezedIndex:
+        if len(self.Windows) <= self.FreezedIndex + 1:
             return None, None
 
         inbounds = []