diff --git a/generators/phhepmc/PHHepMCGenEventv1.cc b/generators/phhepmc/PHHepMCGenEventv1.cc
index bc8eef6f41..3aa7515365 100644
--- a/generators/phhepmc/PHHepMCGenEventv1.cc
+++ b/generators/phhepmc/PHHepMCGenEventv1.cc
@@ -9,6 +9,7 @@
 #include <CLHEP/Vector/Rotation.h>
 
 #include <iostream>  // for cout
+#include <limits>
 #include <map>       // for map
 #include <sstream>
 #include <utility>  // for swap
@@ -109,6 +110,6 @@ float PHHepMCGenEventv1::get_flow_psi(unsigned int n) const
     return it->second;
   }
 
-  std::cout << "PHHepMCGenEventv1::get_flow_psi - Warning - requested reaction plane angle psi_n for n=" << n << " does not exist. Returning 0.0" << std::endl;
-  return 0.0F;
+  std::cout << "PHHepMCGenEventv1::get_flow_psi - Warning - requested reaction plane angle psi_n for n=" << n << " does not exist. Returning NAN" << std::endl;
+  return std::numeric_limits<float>::quiet_NaN();
 }
diff --git a/offline/framework/ffamodules/HeadReco.cc b/offline/framework/ffamodules/HeadReco.cc
index 75e879fdff..17214758c8 100644
--- a/offline/framework/ffamodules/HeadReco.cc
+++ b/offline/framework/ffamodules/HeadReco.cc
@@ -84,10 +84,13 @@ int HeadReco::process_event(PHCompositeNode *topNode)
           {
             evtheader->set_ImpactParameter(hi->impact_parameter());
             evtheader->set_EventPlaneAngle(hi->event_plane_angle());
-            for (unsigned int n = 1; n <= 6; ++n)
-            {
-              evtheader->set_FlowPsiN(n, genevt->get_flow_psi(n));
-            }
+	    if (! genevt->get_flow_psi_map().empty())
+	    {
+	      for (unsigned int n = 1; n <= 6; ++n)
+	      {
+		evtheader->set_FlowPsiN(n, genevt->get_flow_psi(n));
+	      }
+	    }
             evtheader->set_eccentricity(hi->eccentricity());
             evtheader->set_ncoll(hi->Ncoll());
             evtheader->set_npart(hi->Npart_targ() + hi->Npart_proj());