diff --git a/modules/util/viirs_l1b_l2.py b/modules/util/viirs_l1b_l2.py
index c85ad7776a31f6474117afc38cb006b0eb5cd139..1351fcdc265244913c372114c6b9c3fc8c42d31e 100644
--- a/modules/util/viirs_l1b_l2.py
+++ b/modules/util/viirs_l1b_l2.py
@@ -242,10 +242,24 @@ def scan(directory):
 
 def test_nlcomp(file):
     h5f = h5py.File(file, 'r')
+
     cld_phs = get_grid_values_all(h5f, 'cloud_phase', scale_factor_name=None, range_name=None)
+    keep_0 = np.invert(np.isnan(cld_phs))
+
     reff = get_grid_values_all(h5f, 'cld_reff_nlcomp')
+    keep_1 = np.invert(np.isnan(reff))
+
     opd = get_grid_values_all(h5f, 'cld_opd_nlcomp')
+    keep_2 = np.invert(np.isnan(opd))
+
     cld_dz = get_grid_values_all(h5f, 'cld_geo_thick')
+    keep_3 = np.invert(np.isnan(cld_dz))
+
+    keep = keep_0 & keep_1 & keep_2 & keep_3
+    cld_phs = cld_phs[keep]
+    reff = reff[keep]
+    opd = opd[keep]
+    cld_dz = cld_dz[keep]
 
     lwc_c, iwc_c = compute_lwc_iwc(cld_phs, reff, opd, cld_dz)