diff --git a/source/java/org/alfresco/repo/policy/JavaBehaviour.java b/source/java/org/alfresco/repo/policy/JavaBehaviour.java
index 3c207c399f..d9bfe91f33 100644
--- a/source/java/org/alfresco/repo/policy/JavaBehaviour.java
+++ b/source/java/org/alfresco/repo/policy/JavaBehaviour.java
@@ -220,7 +220,7 @@ public class JavaBehaviour implements Behaviour
                 }
                 catch (InvocationTargetException e)
                 {
-                    throw e.getCause();
+                    throw e.getTargetException();
                 }
                 finally
                 {
diff --git a/source/java/org/alfresco/repo/policy/PolicyFactory.java b/source/java/org/alfresco/repo/policy/PolicyFactory.java
index 17e7cb4a4b..661fb373f2 100644
--- a/source/java/org/alfresco/repo/policy/PolicyFactory.java
+++ b/source/java/org/alfresco/repo/policy/PolicyFactory.java
@@ -218,7 +218,7 @@ import java.util.List;
             }
             catch (InvocationTargetException e)
             {
-                throw e.getCause();
+                throw e.getTargetException();
             }
         }
 
diff --git a/source/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java b/source/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java
index 12b10ba820..94f7c18434 100644
--- a/source/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java
+++ b/source/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java
@@ -213,7 +213,7 @@ public class StoreRedirectorProxyFactory<I> implements FactoryBean, Initializing
             }
             catch (InvocationTargetException e)
             {
-                throw e.getCause();
+                throw e.getTargetException();
             }
         }