1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java
index 80281cc..0630f6c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java
@@ -1,5 +1,6 @@
 package com.c2kernel.lifecycle.instance.predefined.agent;
 
+import com.c2kernel.common.CannotManageException;
 import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.ObjectCannotBeUpdated;
 import com.c2kernel.common.ObjectNotFoundException;
@@ -41,6 +42,8 @@ public class RemoveAgent extends PredefinedStep {
 			} catch (ObjectNotFoundException e) {
 				Logger.error(e);
 				throw new InvalidDataException("Tried to remove "+agentName+" from Role "+role.getName()+" that doesn't exist.", "");
+			} catch (CannotManageException e) {
+				throw new InvalidDataException("Tried to alter roles in a non-server process.", "");
 			}
 		}
 		
@@ -54,8 +57,8 @@ public class RemoveAgent extends PredefinedStep {
         
         //remove entity path
         try {
-			Gateway.getLookup().delete(targetAgent);
-		} catch (ObjectCannotBeUpdated e) {
+			Gateway.getLookupManager().delete(targetAgent);
+		} catch (Exception e) {
 			throw new InvalidDataException("Error deleting AgentPath for  "+agentName, "");
 		}
         return requestData;