1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
index 1b9b6f7..a88e000 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
@@ -24,7 +24,8 @@ package com.c2kernel.lifecycle.instance.predefined;
 
 import java.util.Arrays;
 
-import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.InvalidData;
+import com.c2kernel.common.PersistencyException;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.process.Gateway;
@@ -47,19 +48,21 @@ public class RemoveC2KObject extends PredefinedStep
 	//requestdata is xmlstring
     @Override
 	protected String runActivityLogic(AgentPath agent, ItemPath item,
-			int transitionID, String requestData) throws InvalidDataException {
+			int transitionID, String requestData) throws InvalidData, PersistencyException {
 
     	String[] params = getDataList(requestData);
         if (Logger.doLog(3)) Logger.msg(3, "RemoveC2KObject: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));
-
+        if (params.length != 1)
+        	throw new InvalidData("RemoveC2KObject: Invalid parameters "+Arrays.toString(params));
+        String path  = params[0];
+        
         try
         {
-            String path  = params[0];
             Gateway.getStorage().remove( item, path, null );
         }
-        catch( Exception ex )
+        catch( PersistencyException ex )
         {
-            throw unknownException(ex);
+            throw new PersistencyException("RemoveC2KObject: Error removing object '"+path+"': "+ex.getMessage());
         }
         return requestData;
     }