diff --git a/src/feature.cpp b/src/feature.cpp
index e30f3ab7..120b1d09 100644
--- a/src/feature.cpp
+++ b/src/feature.cpp
@@ -13,6 +13,7 @@
 
 #include "feature.h"
 
+#include <cmath>
 #include <limits>
 #include <stdexcept>
 
@@ -48,7 +49,11 @@ Feature::set(const std::string& name, std::size_t value)
 void
 Feature::set(const std::string& name, float value)
 {
-    set(name, static_cast<double>(value));
+    if (std::isnan(value)) {
+        set(name, std::numeric_limits<double>::quiet_NaN());
+    } else {
+        set(name, static_cast<double>(value));
+    }
 }
 
 Feature::FieldValue
diff --git a/test/test_cli.py b/test/test_cli.py
index 44aebed2..855dd391 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -27,8 +27,11 @@ def runner(*args, **kwargs):
                 else:
                     arglist += [f"--{k}", f"{x}"]
 
-        subprocess.run(['./exactextract', '-o', output_fname] + arglist,
-                check=True)
+        cmd = [str(x) for x in ['./exactextract', '-o', output_fname] + arglist]
+
+        #print(' '.join(cmd))
+
+        subprocess.run(cmd, check=True)
 
         with open(output_fname, 'r') as f:
             reader = csv.DictReader(f)
@@ -140,6 +143,24 @@ def test_stats_deferred(run, write_raster, write_features):
     assert float(rows[1]['frac_3']) == 0.25
 
 
+@pytest.mark.parametrize("strategy", ("feature-sequential", "raster-sequential"))
+def test_feature_not_intersecting_raster(strategy, run, write_raster, write_features):
+
+    data = np.array([
+        [1, 2, 3],
+        [1, 2, 2],
+        [3, 3, 3]], np.float32)
+
+    rows = run(
+            polygons=write_features([{"id":1, "geom":"POLYGON ((100 100, 200 100, 200 200, 100 100))"}]),
+            fid="id",
+            raster=f"value:{write_raster(data)}",
+            stat=["count(value)", "mean(value)"])
+
+    assert len(rows) == 1
+    assert rows[0] == {'id' : '1', 'value_count' : '0', 'value_mean' : 'nan'}
+
+
 @pytest.mark.parametrize("strategy", ("feature-sequential", "raster-sequential"))
 def test_include_cols(strategy, run, write_raster, write_features):