diff --git a/hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/utils/EnvUtils.java b/hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/utils/EnvUtils.java
index 9a740ba1c..ae883b214 100644
--- a/hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/utils/EnvUtils.java
+++ b/hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/utils/EnvUtils.java
@@ -29,10 +29,11 @@ private EnvUtils(){
 
     public static WeavingMode getWeavingMode() {
         String wavingModeParam = System.getProperty("weavingMode", WeavingMode.RUNTIME.name()).toUpperCase();
-        WeavingMode weavingMode = WeavingMode.valueOf(wavingModeParam);
-        if (weavingMode == null)
-            throw new IllegalArgumentException("wrong 'weavingMode' property, supported: " + Arrays.toString(WeavingMode.values()) + ", actual = " + wavingModeParam);
-        return weavingMode;
+        try {
+            return WeavingMode.valueOf(wavingModeParam);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("wrong 'weavingMode' property, supported: " + Arrays.toString(WeavingMode.values()) + ", actual = " + wavingModeParam, e);
+        }
     }
 
     public static boolean isCompileWeaving() {