--- a/backend/src/main/java/org/dive4elements/river/backend/SessionHolder.java	Tue Feb 17 13:58:23 2015 +0100
+++ b/backend/src/main/java/org/dive4elements/river/backend/SessionHolder.java	Tue Feb 24 17:16:14 2015 +0100
@@ -27,7 +27,7 @@
             }
         };
 
-    private SessionHolder() {
+    protected SessionHolder() {
     }
 
     public synchronized static Session create() {
@@ -46,6 +46,24 @@
 
     public static void release() {
         log.debug("release");
+        Session session = HOLDER.get();
+        if (session != null) {
+            try {
+                if (!session.isOpen()) {
+                    /* If this check really works in all cases why does hibernate
+                     * does not use it when you call close anyway. */
+                    log.debug("Session is not open. Calling close anyway.");
+                }
+                session.close();
+            } catch (Exception e) {
+                /* Do not try this at home. But hibernate may fail with an NPE
+                 * or any other exception depending on the state of the session.
+                 * According to doc this should only throw a HibernateException but
+                 * we definetely get NPE's here.
+                 */
+                log.error("Exception caught on session close! Session already closed?" + e.getMessage());
+            }
+        }
         HOLDER.remove();
     }
 }