--- branches/development/src/rnemd/RNEMD.cpp	2012/10/03 14:20:07	1803
+++ branches/development/src/rnemd/RNEMD.cpp	2012/11/16 21:18:42	1812
@@ -1521,24 +1521,27 @@ namespace OpenMD {
       den = binMass[i] * nBins_ * PhysicalConstants::densityConvert 
         / currentSnap_->getVolume() ;
 
-      temp = 2.0 * binKE[i] / (binDOF[i] * PhysicalConstants::kb *
-                               PhysicalConstants::energyConvert);
-  
-      for (unsigned int j = 0; j < outputMask_.size(); ++j) {
-        if(outputMask_[j]) {
-          switch(j) {
-          case Z:
-            (data_[j].accumulator[i])->add(z);
-            break;
-          case TEMPERATURE:
-            data_[j].accumulator[i]->add(temp);
-            break;
-          case VELOCITY:
-            dynamic_cast<VectorAccumulator *>(data_[j].accumulator[i])->add(vel);
-            break;
-          case DENSITY:
-            data_[j].accumulator[i]->add(den);
-            break;
+      if (binCount[i] > 0) {
+        // only add values if there are things to add
+        temp = 2.0 * binKE[i] / (binDOF[i] * PhysicalConstants::kb *
+                                 PhysicalConstants::energyConvert);
+        
+        for (unsigned int j = 0; j < outputMask_.size(); ++j) {
+          if(outputMask_[j]) {
+            switch(j) {
+            case Z:
+              dynamic_cast<Accumulator *>(data_[j].accumulator[i])->add(z);
+              break;
+            case TEMPERATURE:
+              dynamic_cast<Accumulator *>(data_[j].accumulator[i])->add(temp);
+              break;
+            case VELOCITY:
+              dynamic_cast<VectorAccumulator *>(data_[j].accumulator[i])->add(vel);
+              break;
+            case DENSITY:
+              dynamic_cast<Accumulator *>(data_[j].accumulator[i])->add(den);
+              break;
+            }
           }
         }
       }