diff --git a/genmonlib/controller.py b/genmonlib/controller.py
index d4a362cd..c96a2d33 100644
--- a/genmonlib/controller.py
+++ b/genmonlib/controller.py
@@ -481,6 +481,10 @@ def FuelLogger(self):
 
                 FuelValue = self.GetFuelLevel(ReturnFloat=True)
 
+                if FuelValue == None:
+                    if self.WaitForExit("FuelLogger", self.FuelLogFrequency * 60.0):
+                        return
+                    continue
                 if FuelValue == LastFuelValue:
                     continue
 
@@ -2517,6 +2521,8 @@ def GetFuelLevel(self, ReturnFloat=False):
                 FuelLevel = float(FuelInTank) / float(self.TankSize) * 100
         else:
             FuelLevel = 0
+        if FuelLevel == None:
+            return FuelLevel
         if ReturnFloat:
             return float(FuelLevel)
         else: