diff --git a/core/src/main/java/com/zaxxer/hikari/javassist/HikariClassTransformer.java b/core/src/main/java/com/zaxxer/hikari/javassist/HikariClassTransformer.java
index c99ffcab..8b5d6ee7 100644
--- a/core/src/main/java/com/zaxxer/hikari/javassist/HikariClassTransformer.java
+++ b/core/src/main/java/com/zaxxer/hikari/javassist/HikariClassTransformer.java
@@ -253,7 +253,7 @@ public class HikariClassTransformer implements ClassFileTransformer
 
         if (LOGGER.isDebugEnabled())
         {
-            target.debugWriteFile("/tmp");
+            target.debugWriteFile(System.getProperty("java.io.tmpdir"));
         }
         return target.toBytecode();
     }
@@ -345,13 +345,16 @@ public class HikariClassTransformer implements ClassFileTransformer
         }
 
         CtConstructor destInitializer = targetClass.getClassInitializer();
-        if (destInitializer == null && srcInitializer != null)
+        if (destInitializer == null)
         {
-            CtConstructor copy = CtNewConstructor.copy(srcInitializer, targetClass, null);
-            targetClass.addConstructor(copy);
-            CtMethod __static = CtNewMethod.make(Modifier.STATIC, CtClass.voidType, "__static", null, null, "{}", targetClass);
-            targetClass.addMethod(__static);
-            LOGGER.debug("Copied static initializer of {} to {}", srcClass.getSimpleName(), targetClass.getSimpleName());
+            if (srcInitializer != null)
+            {
+                CtConstructor copy = CtNewConstructor.copy(srcInitializer, targetClass, null);
+                targetClass.addConstructor(copy);
+                CtMethod __static = CtNewMethod.make(Modifier.STATIC, CtClass.voidType, "__static", null, null, "{}", targetClass);
+                targetClass.addMethod(__static);
+                LOGGER.debug("Copied static initializer of {} to {}", srcClass.getSimpleName(), targetClass.getSimpleName());
+            }
         }
         else
         {