--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/experimental/SquarifiedTreeMap.java	Wed Oct 26 16:04:20 2016 -0400
+++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/experimental/SquarifiedTreeMap.java	Wed Oct 26 16:54:04 2016 -0400
@@ -297,14 +297,13 @@
     }
     
     /**
-     * Check if a double value is defined as Not a Number and sets it to 0.
+     * Ensure that a value is within an expected numeric range
      * @param d the value to check.
-     * @return the checked value: 0 if the given number is NaN, else the number
-     * itself.
+     * @return 0 if the input is NaN, else the number
      */
-    private double validate(double d) {
-        if (d == Double.NaN) {
-            d = 0;
+    double validate(double d) {
+        if (Double.isNaN(d)) {
+            return 0;
         }
         return d;
     }

--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/SquarifiedTreeMapTest.java	Wed Oct 26 16:04:20 2016 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/SquarifiedTreeMapTest.java	Wed Oct 26 16:54:04 2016 -0400
@@ -64,6 +64,12 @@
     }
 
     @Test
+    public void validateNan() {
+        algorithm = new SquarifiedTreeMap(region, elements);
+        assertEquals(0, algorithm.validate(Double.NaN), DELTA);
+    }
+
+    @Test
     public final void testSquarifiedTreeMapWithInvalidParameters() {
         //check every parameters combinations
         boolean caught = false;
@@ -122,4 +128,4 @@
         
         assertEquals(region.getWidth() * region.getHeight(), totArea, DELTA);
     }
-}
\ No newline at end of file
+}