diff --git a/persistent/ChangeLog.md b/persistent/ChangeLog.md
index 42785f073..8d63f4d0f 100644
--- a/persistent/ChangeLog.md
+++ b/persistent/ChangeLog.md
@@ -1,5 +1,10 @@
 # Changelog for persistent
 
+## 2.13.0.1
+
+* [#1268](https://github.com/yesodweb/persistent/pull/1268)
+    * Show `keyFromValues` error
+
 ## 2.13.0.0
 
 * [#1244](https://github.com/yesodweb/persistent/pull/1244)
diff --git a/persistent/Database/Persist/Sql/Util.hs b/persistent/Database/Persist/Sql/Util.hs
index e9a61ecf1..c871d5746 100644
--- a/persistent/Database/Persist/Sql/Util.hs
+++ b/persistent/Database/Persist/Sql/Util.hs
@@ -188,7 +188,8 @@ parseEntityValues t vals =
         case fromPersistValues xs of
             Left e -> Left e
             Right xs' -> case keyFromValues keyvals of
-                Left _ -> error "fromPersistValuesComposite': keyFromValues failed"
+                Left err -> error $ "fromPersistValuesComposite': keyFromValues failed with error: "
+                    <> T.unpack err
                 Right key -> Right (Entity key xs')
 
 
diff --git a/persistent/persistent.cabal b/persistent/persistent.cabal
index 4c2669287..ca0b55608 100644
--- a/persistent/persistent.cabal
+++ b/persistent/persistent.cabal
@@ -1,5 +1,5 @@
 name:            persistent
-version:         2.13.0.0
+version:         2.13.0.1
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>