2 files changed, 8 insertions, 6 deletions
diff --git a/src/Common/HostInfo.h b/src/Common/HostInfo.h
index db7f5d1..c036b5c 100644
--- a/src/Common/HostInfo.h
+++ b/src/Common/HostInfo.h
@@ -27,7 +27,7 @@ namespace Common {
 
 class HostInfo {
   public:
-    enum Status {
+    enum State {
       INACTIVE, RUNNING
     };
 
@@ -35,10 +35,10 @@ class HostInfo {
     std::string name;
     std::string ip;
 
-    Status status;
+    State state;
 
   public:
-    HostInfo(const std::string& name0 = std::string()) : name(name0), status(INACTIVE) {}
+    HostInfo(const std::string& name0 = std::string()) : name(name0), state(INACTIVE) {}
 
     void setName(const std::string &newName) {name = newName;}
     const std::string& getName() const {return name;}
@@ -46,8 +46,8 @@ class HostInfo {
     void setIP(const std::string& newIp) {ip = newIp;}
     const std::string& getIP() const {return ip;}
 
-    void setStatus(Status newStatus) {status = newStatus;}
-    Status getStatus() const {return status;}
+    void setState(State newState) {state = newState;}
+    State getState() const {return state;}
 };
 
 }
diff --git a/src/Common/RequestManager.cpp b/src/Common/RequestManager.cpp
index afe72b0..8d0c73c 100644
--- a/src/Common/RequestManager.cpp
+++ b/src/Common/RequestManager.cpp
@@ -102,8 +102,10 @@ void RequestManager::receiveHandler(Net::Connection *connection, const Net::Pack
 bool RequestManager::sendRequest(Net::Connection *connection, std::auto_ptr<RequestBase> request) {
   std::map<Net::Connection*,RequestMap*>::iterator it = requestMaps.find(connection);
 
-  if(it == requestMaps.end())
+  if(it == requestMaps.end()) {
+    Logger::log(Logger::CRITICAL, "Trying to send a request over an unregistered connecion.");
     return false;
+  }
 
   RequestMap *requestMap = it->second;