diff --git a/li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java b/li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java
index 3b3869d9c..6e8c6d9a8 100644
--- a/li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java
+++ b/li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java
@@ -106,6 +106,8 @@ public class DefaultPolicyHandler extends StrolchComponent implements PolicyHand
 			return constructor.newInstance(getContainer(), tx);
 
 		} catch (Exception e) {
+			if (e instanceof StrolchPolicyException)
+				throw (StrolchPolicyException) e;
 			throw new StrolchPolicyException(
 					MessageFormat.format("Failed to instantiate policy {0} due to {1}", policyDef, e.getMessage()), e);
 		}