diff --git a/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
index 41300803..06a3f55a 100644
--- a/src/main/java/com/zaxxer/hikari/HikariDataSource.java
+++ b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
@@ -172,14 +172,14 @@ public class HikariDataSource extends HikariConfig implements DataSource
     {
         boolean shutdown = isShutdown;
         isShutdown = true;
-        if (!shutdown)
+        if (!shutdown && pool != null)
         {
             pool.shutdown();
-        }
-
-        if (pool.dataSource instanceof DriverDataSource)
-        {
-            ((DriverDataSource) pool.dataSource).shutdown();
+            
+            if (pool.dataSource instanceof DriverDataSource)
+            {
+                ((DriverDataSource) pool.dataSource).shutdown();
+            }
         }
 
         pool = null;