diff --git a/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java b/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
index 0ae6cd35..8f41ce82 100644
--- a/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
+++ b/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
@@ -67,27 +67,27 @@ public class HikariJNDIFactory implements ObjectFactory
       return createDataSource(properties, nameCtx);
    }
 
-   private DataSource createDataSource(Properties properties, Context context) throws NamingException
+   private DataSource createDataSource(final Properties properties, final Context context) throws NamingException
    {
-      if (properties.getProperty("dataSourceJNDI") != null) {
-         return lookupJndiDataSource(properties, context);
+      String jndiName = properties.getProperty("dataSourceJNDI");
+      if (jndiName != null) {
+         return lookupJndiDataSource(properties, context, jndiName);
       }
 
       return new HikariDataSource(new HikariConfig(properties));
    }
 
-   private DataSource lookupJndiDataSource(Properties properties, Context context) throws NamingException
+   private DataSource lookupJndiDataSource(final Properties properties, final Context context, final String jndiName) throws NamingException
    {
-      String jndiName = properties.getProperty("dataSourceJNDI");
       if (context == null) {
          throw new RuntimeException("JNDI context does not found for dataSourceJNDI : " + jndiName);
       }
 
       DataSource jndiDS = (DataSource) context.lookup(jndiName);
       if (jndiDS == null) {
-         context = new InitialContext();
-         jndiDS = (DataSource) context.lookup(jndiName);
-         //context.close(); //it should remain open for global contexts?
+         Context initContext = new InitialContext();
+         jndiDS = (DataSource) initContext.lookup(jndiName);
+         //context.close(); // questionable
       }
 
       if (jndiDS != null) {
diff --git a/src/test/java/com/zaxxer/hikari/pool/TestJNDI.java b/src/test/java/com/zaxxer/hikari/pool/TestJNDI.java
index 280810bf..48d86988 100644
--- a/src/test/java/com/zaxxer/hikari/pool/TestJNDI.java
+++ b/src/test/java/com/zaxxer/hikari/pool/TestJNDI.java
@@ -84,7 +84,7 @@ public class TestJNDI
          Assert.fail();
       }
       catch (RuntimeException e) {
-         Assert.assertTrue(e.getMessage().contains("JNDI context is null"));
+         Assert.assertTrue(e.getMessage().contains("JNDI context does not found"));
       }
    }