diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py
index 3700c007e601ef6691352dbddd3b26683903553a..785eb9603daa2e54812f67f312acb53301005e21 100644
--- a/modules/icing/pirep_goes.py
+++ b/modules/icing/pirep_goes.py
@@ -2,7 +2,7 @@ from icing.pireps import pirep_icing
 import numpy as np
 import pickle
 import os
-from util.util import get_time_tuple_utc
+from util.util import get_time_tuple_utc, GenericException
 from aeolus.datasource import CLAVRx, GOESL1B
 from util.geos_nav import GEOSNavigation
 import h5py
@@ -20,8 +20,8 @@ goes_ds_dct = {}
 ice_dict = None
 no_ice_dict = None
 time_keys = None
-pirep_file = '/home/rink/data/pireps/pireps_2019010000_2019063023.csv'
-#pirep_file = '/home/rink/data/pireps/pireps_20180101_20200331.csv'
+#pirep_file = '/home/rink/data/pireps/pireps_2019010000_2019063023.csv'
+pirep_file = '/home/rink/data/pireps/pireps_20180101_20200331.csv'
 
 l1b_ds_list = ['temp_10_4um_nom', 'temp_11_0um_nom', 'temp_12_0um_nom', 'temp_13_3um_nom', 'temp_3_75um_nom',
                'temp_6_2um_nom', 'temp_6_7um_nom', 'temp_7_3um_nom', 'temp_8_5um_nom', 'temp_9_7um_nom',
@@ -35,7 +35,7 @@ ds_list = ['cld_height_acha', 'cld_geo_thick', 'cld_press_acha', 'sensor_zenith_
            'cld_opd_dcomp', 'cld_opd_dcomp_1', 'cld_opd_dcomp_2', 'cld_opd_dcomp_3', 'cld_cwp_dcomp']
 ds_grd_dct = {name: [] for name in ds_list}
 
-a_clvr_file = '/Users/tomrink/data/clavrx/clavrx_OR_ABI-L1b-RadC-M3C01_G16_s20190020002186.level2.nc'
+a_clvr_file = '/home/rink/data/clavrx/clavrx_OR_ABI-L1b-RadC-M3C01_G16_s20190020002186.level2.nc'
 
 
 def setup():
@@ -167,19 +167,29 @@ def run(pirep_dct, outfile=None, outfile_l1b=None):
             if cc[0] < 0:
                 continue
 
+            cnt_a = 0
             for didx, ds_name in enumerate(ds_list):
                 gvals = get_grid_values(h5f, ds_name, ll[0], cc[0], 20)
                 if gvals is not None:
                     ds_grd_dct[ds_name].append(gvals)
+                    cnt_a += 1
 
+            cnt_b = 0
             for didx, ds_name in enumerate(l1b_ds_list):
                 gvals = get_grid_values(h5f, ds_name, ll[0], cc[0], 20)
                 if gvals is not None:
                     l1b_grd_dct[ds_name].append(gvals)
+                    cnt_b += 1
 
-            lon_c.append(lon_s[0])
-            lat_c.append(lat_s[0])
-            time_s.append(time)
+            if cnt_a > 0 and cnt_a != len(ds_list):
+                raise GenericException('weirdness')
+            if cnt_b > 0 and cnt_b != len(l1b_ds_list):
+                raise GenericException('weirdness')
+
+            if cnt_a == len(ds_list) and cnt_b == len(l1b_ds_list):
+                lon_c.append(lon_s[0])
+                lat_c.append(lat_s[0])
+                time_s.append(time)
 
     data_dct = {}
     for ds_name in ds_list: