Add NULL component pointer check to ParameterMap::get

Refs #8057
mantidproject · Oct 4, 2013 · 74c23e1 · 74c23e1
1 parent 4fddadd
commit 74c23e1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp
@@ -497,7 +497,8 @@ namespace Mantid
     Parameter_sptr ParameterMap::get(const IComponent* comp, const std::string& name, 
                                      const std::string & type) const
     {
-      Parameter_sptr result = Parameter_sptr();
+      Parameter_sptr result;
+      if(!comp) return result;
       PARALLEL_CRITICAL(ParameterMap_get)
       {
         if( !m_map.empty() )