Index: trunk/FACT++/src/StateMachineImp.cc
===================================================================
--- trunk/FACT++/src/StateMachineImp.cc	(revision 10308)
+++ trunk/FACT++/src/StateMachineImp.cc	(revision 10309)
@@ -650,8 +650,8 @@
 //!    as string.
 //!
-const string StateMachineImp::GetStateName(int state) /*const*/
-{
-    const string &str = fStateNames[state].first;
-    return str.empty() ? Form("%d", state) : str;
+const string StateMachineImp::GetStateName(int state) const
+{
+    const StateNames::const_iterator i = fStateNames.find(state);
+    return i==fStateNames.end() || i->second.first.empty() ? Form("%d", state) : i->second.first;
 }
 
@@ -666,7 +666,8 @@
 //!    returned.
 //!
-const string StateMachineImp::GetStateDesc(int state) /*const*/
-{
-    return fStateNames[state].second;
+const string StateMachineImp::GetStateDesc(int state) const
+{
+    const StateNames::const_iterator i = fStateNames.find(state);
+    return i==fStateNames.end() ? "" : i->second.second;
 }
 
@@ -685,5 +686,5 @@
 //!
 //
-const string StateMachineImp::GetStateDescription(int state) /*const*/
+const string StateMachineImp::GetStateDescription(int state) const
 {
     const string &str = GetStateName(state);
Index: trunk/FACT++/src/StateMachineImp.h
===================================================================
--- trunk/FACT++/src/StateMachineImp.h	(revision 10308)
+++ trunk/FACT++/src/StateMachineImp.h	(revision 10309)
@@ -31,6 +31,8 @@
     int fCurrentState;   /// Current state of the state machine
 
+    typedef std::map<const int, std::pair<std::string, std::string>> StateNames;
+
     /// Human readable names associated with the states
-    std::map<const int, std::pair<std::string, std::string>> fStateNames;
+    StateNames fStateNames;
 
     std::vector<EventImp*> fListOfEvents; /// List of available commands as setup by user
@@ -121,12 +123,12 @@
 
 
-    const std::string GetStateName(int state) /*const*/;
-    const std::string GetStateName() { return GetStateName(fCurrentState); }
-
-    const std::string GetStateDesc(int state) /*const*/;
-    const std::string GetStateDesc() { return GetStateDesc(fCurrentState); }
-
-    const std::string GetStateDescription(int state) /*const*/;
-    const std::string GetStateDescription() { return GetStateDescription(fCurrentState); }
+    const std::string GetStateName(int state) const;
+    const std::string GetStateName() const { return GetStateName(fCurrentState); }
+
+    const std::string GetStateDesc(int state) const;
+    const std::string GetStateDesc() const { return GetStateDesc(fCurrentState); }
+
+    const std::string GetStateDescription(int state) const;
+    const std::string GetStateDescription() const { return GetStateDescription(fCurrentState); }
 };