diff --git a/pom.xml b/pom.xml
index 7c21e2b..bb59d35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.helenus</groupId>
     <artifactId>helenus-core</artifactId>
-    <version>2.0.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>helenus</name>
diff --git a/src/main/java/net/helenus/core/UnitOfWork.java b/src/main/java/net/helenus/core/UnitOfWork.java
index bba8b85..8635f43 100644
--- a/src/main/java/net/helenus/core/UnitOfWork.java
+++ b/src/main/java/net/helenus/core/UnitOfWork.java
@@ -8,7 +8,7 @@ import java.util.*;
 
 
 /** Encapsulates the concept of a "transaction" as a unit-of-work. */
-public class UnitOfWork implements AutoCloseable {
+public class UnitOfWork<T extends Exception> implements AutoCloseable {
   protected static Class<? extends Exception>conflictExceptionClass = ConflictingUnitOfWorkException.class;
   private final List<UnitOfWork> nested = new ArrayList<>();
   private final HelenusSession session;
@@ -52,7 +52,7 @@ public class UnitOfWork implements AutoCloseable {
   }
 
   public Set<Object> cacheLookup(String key) {
-    UnitOfWork p = this;
+    UnitOfWork<T> p = this;
     do {
       Set<Object> r = p.getCache().get(key);
       if (r != null) {
@@ -73,9 +73,9 @@ public class UnitOfWork implements AutoCloseable {
    * Checks to see if the work performed between calling begin and now can be committed or not.
    *
    * @return a function from which to chain work that only happens when commit is successful
-   * @throws ConflictingUnitOfWorkException when the work overlaps with other concurrent writers.
+   * @throws T when the work overlaps with other concurrent writers.
    */
-  public PostCommitFunction<Void, Void> commit() throws Exception {
+  public PostCommitFunction<Void, Void> commit() throws T {
     // All nested UnitOfWork should be committed (not aborted) before calls to commit, check.
     boolean canCommit = true;
     TreeTraverser<UnitOfWork> traverser = TreeTraverser.using(node -> node::getChildNodes);
@@ -122,8 +122,8 @@ public class UnitOfWork implements AutoCloseable {
       }
     }
     // else {
-    // Constructor<?> ctor = clazz.getConstructor(conflictExceptionClass);
-    // Object object = ctor.newInstance(new Object[] { String message });
+    // Constructor<T> ctor = clazz.getConstructor(conflictExceptionClass);
+    // T object = ctor.newInstance(new Object[] { String message });
     // }
     return new PostCommitFunction(this, postCommit);
   }