diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/CMakeLists.txt b/Reconstruction/PFlow/PFlowValidation/PFODQA/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..39ead08f692ca76a1929b309846850d2424491ea
--- /dev/null
+++ b/Reconstruction/PFlow/PFlowValidation/PFODQA/CMakeLists.txt
@@ -0,0 +1,28 @@
+################################################################################
+# Package: PFODQA
+################################################################################
+
+# Declare the package name:
+atlas_subdir( PFODQA )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          GaudiKernel
+                          PRIVATE
+                          Control/AthenaMonitoring
+                          Event/xAOD/xAODCaloEvent
+                          Event/xAOD/xAODPFlow
+                          Reconstruction/PFlow/PFlowUtils
+                          Reconstruction/PFlow/PFlowValidation/PFOHistUtils
+                          Tracking/TrkValidation/TrkValHistUtils )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_component( PFODQA
+                     src/*.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaMonitoringLib xAODCaloEvent xAODPFlow PFOHistUtils TrkValHistUtils )
+
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/Changelog b/Reconstruction/PFlow/PFlowValidation/PFODQA/Changelog
index f1f4f3dd08d79d0aae7597f48849cb15471466c5..0798e9bf704a5b229b6068157db50d0780449f42 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/Changelog
+++ b/Reconstruction/PFlow/PFlowValidation/PFODQA/Changelog
@@ -1,3 +1,7 @@
+11 May 2015 Mark Hodgkinson
+Fix Coverity issues 17432, 16380	
+Tag as PFODQA-00-00-10
+	
 4 November 2014 Mark Hodgkinson
 Add usage of new PFOAttributes class
 Tag as PFODQA-00-00-09
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValCluster.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValCluster.cxx
index ea2bc87af5eec298bc182490b1cb1daefdea7f65..fc8e5ce64f7fa5afd1f7c79eaeb5bd7849e717e2 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValCluster.cxx
+++ b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValCluster.cxx
@@ -42,6 +42,7 @@ StatusCode PhysValCluster::fillHistograms(){
 
   if (!theClusterContainer){
     if (msgLvl(MSG::WARNING))  msg(MSG::WARNING) << " Have NULL pointer to xAOD::PFOContainer " << endreq;
+    return StatusCode::SUCCESS;
   }
   
   xAOD::CaloClusterContainer::const_iterator firstCluster = theClusterContainer->begin();
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValPFO.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValPFO.cxx
index a2662392ea05d8d31f337f179fc2432c9f9d5e27..d50ef7680b287dbd235f9f0d30e1c25ead075f33 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValPFO.cxx
+++ b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValPFO.cxx
@@ -59,6 +59,7 @@ StatusCode PhysValPFO::fillHistograms(){
 
   if (!thePFOContainer){
     if (msgLvl(MSG::WARNING))  msg(MSG::WARNING) << " Have NULL pointer to xAOD::PFOContainer " << endreq;
+    return StatusCode::SUCCESS;
   }
   
   xAOD::PFOContainer::const_iterator firstPFO = thePFOContainer->begin();