diff --git a/modules/util/util.py b/modules/util/util.py
index e9090c2c1e53f8715f0b5829dc3d0bb0e58dfdf8..aca86e0b0659e48b4e029b99a250e8b7b757225d 100644
--- a/modules/util/util.py
+++ b/modules/util/util.py
@@ -754,9 +754,24 @@ def make_for_full_domain_predict_viirs_clavrx(h5f, name_list=None, res_fac=1, da
 
     if use_nl_comp:
         cld_phase = get_grid_values(h5f, 'cloud_phase', j_0, i_0, None, num_j=ylen, num_i=xlen)
+        keep_0 = np.invert(np.isnan(cld_phase))
+
         cld_dz = get_grid_values(h5f, 'cld_geo_thick', j_0, i_0, None, num_j=ylen, num_i=xlen)
+        keep_1 = np.logical_and(np.invert(np.isnan(cld_dz)), cld_dz > 5.0)
+
         reff = grd_dct['cld_reff_dcomp']
+        keep_2 = np.invert(np.isnan(reff))
+
         opd = grd_dct['cld_opd_dcomp']
+        keep_3 = np.invert(np.isnan(opd))
+
+        keep = keep_0 & keep_1 & keep_2 & keep_3
+
+        cld_phase = cld_phase[keep]
+        reff = reff[keep]
+        opd = opd[keep]
+        cld_dz = cld_dz[keep]
+
         lwc_nlcomp, iwc_nlcomp = compute_lwc_iwc(cld_phase, reff, opd, cld_dz)
         grd_dct['iwc_dcomp'] = iwc_nlcomp
         grd_dct['lwc_dcomp'] = lwc_nlcomp