diff --git a/source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp b/source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp
index 608f5a66255ed63690512fd3b8a470b9fa352181..8e60a93726e057532bdaf24caa3dd525afa2840d 100644
--- a/source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp
+++ b/source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp
@@ -96,22 +96,15 @@ namespace armarx::armem::client
     mns::dto::MemoryServerInterfaces
     MemoryNameSystem::resolveServer(const MemoryID& memoryID)
     {
-        /*if (auto it = servers.find(memoryID.memoryName); it != servers.end())
+	update();
+        if (auto it = servers.find(memoryID.memoryName); it != servers.end())
         {
             return it->second;
         }
         else
-        {*/
-            update();
-            if (auto it = servers.find(memoryID.memoryName); it != servers.end())
-            {
-                return it->second;
-            }
-            else
-            {
-                throw error::CouldNotResolveMemoryServer(memoryID);
-            }
-        /*}*/
+        {
+            throw error::CouldNotResolveMemoryServer(memoryID);
+        }
     }
 
 
@@ -139,7 +132,7 @@ namespace armarx::armem::client
             {
                 throw error::CouldNotResolveMemoryServer(memoryID, result.errorMessage);
             }
-        /*}*/
+        }
     }
 
     mns::dto::MemoryServerInterfaces MemoryNameSystem::useServer(const MemoryID& memoryID)
@@ -159,7 +152,7 @@ namespace armarx::armem::client
         mns::dto::MemoryServerInterfaces server = waitForServer(memoryID);
         // Add dependency.
 
-        component.usingProxy(server.reading->ice_getIdentity().name)
+        component.usingProxy(server.reading->ice_getIdentity().name);
         return server;
     }