1 files changed, 3 insertions, 6 deletions
diff --git a/src/Server/ConnectionManager.cpp b/src/Server/ConnectionManager.cpp
index bbaf673..abb66b0 100644
--- a/src/Server/ConnectionManager.cpp
+++ b/src/Server/ConnectionManager.cpp
@@ -231,17 +231,14 @@ boost::shared_ptr<Common::Connection> ConnectionManager::getDaemonConnection(con
     }
   }
 
-  throw(Net::Exception::NOT_AVAILABLE);
+  throw Net::Exception(Net::Exception::NOT_AVAILABLE);
 }
 
 std::string ConnectionManager::getDaemonName(const Common::Connection *con) const throw (Net::Exception&) {
   const ServerConnection *connection = dynamic_cast<const ServerConnection*>(con);
 
-  if(connection) {
-    if(connection->isIdentified()) {
-      return connection->getHostInfo()->getName();
-    }
-  }
+  if(connection && connection->getConnectionType() == ServerConnection::DAEMON)
+    return connection->getHostInfo()->getName();
 
   throw Net::Exception(Net::Exception::UNKNOWN_DAEMON);
 }