diff --git a/step-grid-agent/src/main/java/step/grid/agent/forker/AgentForker.java b/step-grid-agent/src/main/java/step/grid/agent/forker/AgentForker.java
index 7a30a18..b6005d5 100644
--- a/step-grid-agent/src/main/java/step/grid/agent/forker/AgentForker.java
+++ b/step-grid-agent/src/main/java/step/grid/agent/forker/AgentForker.java
@@ -262,7 +262,11 @@ public OutputMessage delegateExecution(InputMessage message) throws Exception {
             }
 
             logger.info("Calling forked agent {}...", id);
-            return gridClient.call(tokenHandle.getID(), message.getPayload(), message.getHandler(), message.getHandlerPackage(), message.getProperties(), callTimeout);
+            try {
+                return gridClient.call(tokenHandle.getID(), message.getPayload(), message.getHandler(), message.getHandlerPackage(), message.getProperties(), callTimeout);
+            } catch (AbstractGridClientImpl.AgentCommunicationException e) {
+                throw new AbstractGridClientImpl.AgentCommunicationException("Communication with the forked agent failed.", e);
+            }
         }
 
         public void interruptExecution() {