diff --git a/src/java/com/samskivert/depot/PersistenceContext.java b/src/java/com/samskivert/depot/PersistenceContext.java
index deddc1b..55d5594 100644
--- a/src/java/com/samskivert/depot/PersistenceContext.java
+++ b/src/java/com/samskivert/depot/PersistenceContext.java
@@ -570,7 +570,9 @@ public class PersistenceContext
                 }
 
             } finally {
-                _conprov.releaseConnection(_ident, isReadOnly, conn);
+                if (conn != null) {
+                    _conprov.releaseConnection(_ident, isReadOnly, conn);
+                }
             }
         }