diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index 33f6db6fce66261644d74e9060e6491f215c0c9d..cab22ede0b367ff0ee0b782893a3b5367e39a913 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -1755,9 +1755,11 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_path, calipso_clavrx_file, amv_f
     amv_ds = Dataset(fname)
     amv_lons = amv_ds[amv_files.lon_name][:]
     amv_lats = amv_ds[amv_files.lat_name][:]
-    amv_cc = amv_ds[amv_files.elem_name][:]
-    amv_ll = amv_ds[amv_files.line_name][:]
-    amv_cc, amv_ll = nav.earth_to_lc_s(amv_lons, amv_lats)
+    if amv_files.elem_name is not None:
+        amv_cc = amv_ds[amv_files.elem_name][:]
+        amv_ll = amv_ds[amv_files.line_name][:]
+    else:
+        amv_cc, amv_ll = nav.earth_to_lc_s(amv_lons, amv_lats)
 
     param_s = []
     param_s.append(amv_lons)