diff --git a/database/middleware.go b/database/middleware.go
index 451d4697dcbfbff6bb12f4c21f9be9e4357d8738..c5980ab1ba27ede787540f5ea8c7f33f3877eb97 100644
--- a/database/middleware.go
+++ b/database/middleware.go
@@ -5,6 +5,7 @@ 	"context"
 	"database/sql"
 	sqldriver "database/sql/driver"
 	"errors"
+	"fmt"
 	"net/http"
 )
 
@@ -69,7 +70,11 @@ 		// this case. See https://github.com/lib/pq/issues/1137
 		return err
 	}
 	if txErr != nil && txErr != sql.ErrTxDone {
-		panic(txErr)
+		if err != nil {
+			panic(fmt.Errorf("Transaction error: %v\nClosure error: %v", txErr, err))
+		} else {
+			panic(txErr)
+		}
 	}
 	return err
 }