diff --git a/src/java/com/samskivert/depot/PersistenceContext.java b/src/java/com/samskivert/depot/PersistenceContext.java
index 875ff97..7bff8e3 100644
--- a/src/java/com/samskivert/depot/PersistenceContext.java
+++ b/src/java/com/samskivert/depot/PersistenceContext.java
@@ -184,7 +184,9 @@ public class PersistenceContext
         } catch (Throwable t) {
             log.warning("Failure shutting down Depot cache.", t);
         }
-        _conprov.shutdown();
+        if (_conprov != null) {
+            _conprov.shutdown();
+        }
     }
 
     /**