diff --git a/JFMC_CalibWriter_wBP.cpp b/JFMC_CalibWriter_wBP.cpp
index 3d26ca9..7c0dc14 100644
--- a/JFMC_CalibWriter_wBP.cpp
+++ b/JFMC_CalibWriter_wBP.cpp
@@ -299,22 +299,22 @@ int main(int argc, char* argv[]) {
     // crazy and missing value check: replace with module default
     // think of a way to get the limits better
     
-    if (mapsObject->hg0VALs[i] < 80 || mapsObject->hg0VALs[i] > 120) {
+    if (mapsObject->hg0VALs[i] < 80 || mapsObject->hg0VALs[i] > 120 || isnan(mapsObject->hg0VALs[i])) {
       mapsObject->hg0VALs[i] = defaultHG0;
       defaultvalmap_hg0->Fill(i%NC,i/NC,1);
     }
 
-    if (mapsObject->g0VALs[i] < 30 || mapsObject->g0VALs[i] > 48) {
+    if (mapsObject->g0VALs[i] < 30 || mapsObject->g0VALs[i] > 48 || isnan(mapsObject->g0VALs[i])) {
       mapsObject->g0VALs[i] = defaultG0;
       defaultvalmap_g0->Fill(i%NC,i/NC,1);
     }
 
-    if (mapsObject->g1VALs[i] < -2.0 || mapsObject->g1VALs[i] > -0.5) {
+    if (mapsObject->g1VALs[i] < -2.0 || mapsObject->g1VALs[i] > -0.5 || isnan(mapsObject->g1VALs[i])) {
       mapsObject->g1VALs[i] = defaultG1;
       defaultvalmap_g1->Fill(i%NC,i/NC,1);
     }
 
-    if (mapsObject->g2VALs[i] <  -0.2 || mapsObject->g2VALs[i] > -0.02) {
+    if (mapsObject->g2VALs[i] <  -0.2 || mapsObject->g2VALs[i] > -0.02 || isnan(mapsObject->g2VALs[i])) {
       mapsObject->g2VALs[i] = defaultG2;
       defaultvalmap_g2->Fill(i%NC,i/NC,1);
     }