diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java
index c1956da1..3c7003de 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java
@@ -48,8 +48,12 @@ public final class PropertyBeanSetter
 
       Enumeration<?> propertyNames = properties.propertyNames();
       while (propertyNames.hasMoreElements()) {
-         String propName = propertyNames.nextElement().toString();
+         Object key = propertyNames.nextElement();
+         String propName = key.toString();
          Object propValue = properties.getProperty(propName);
+         if (propValue == null) {
+            propValue = properties.get(key);
+         }
 
          if (target instanceof HikariConfig && propName.startsWith("dataSource.")) {
             HikariConfig config = (HikariConfig) target;
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java b/hikaricp/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java
index c1956da1..3c7003de 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java
@@ -48,8 +48,12 @@ public final class PropertyBeanSetter
 
       Enumeration<?> propertyNames = properties.propertyNames();
       while (propertyNames.hasMoreElements()) {
-         String propName = propertyNames.nextElement().toString();
+         Object key = propertyNames.nextElement();
+         String propName = key.toString();
          Object propValue = properties.getProperty(propName);
+         if (propValue == null) {
+            propValue = properties.get(key);
+         }
 
          if (target instanceof HikariConfig && propName.startsWith("dataSource.")) {
             HikariConfig config = (HikariConfig) target;