diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index b820acde93cbf327593ec43237d7cccb30228d66..c187f8a28e4706718be89a6b639e7149e8513de6 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -500,10 +500,9 @@ def run_best_fit(raob_to_amv_dct, raob_dct, gfs_at_raob_dct):
     out_dct = {}
     keys = list(raob_to_amv_dct.keys())
 
-    do_gfs_best_fit = True
-    gfs_press = None
-    gfs_spd = None
-    gfs_dir = None
+    do_gfs_best_fit = False
+    if gfs_at_raob_dct is not None:
+        do_gfs_best_fit = True
 
     for key_idx, key in enumerate(keys):
         raob = raob_dct.get(key)