diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java
index a5ad2a771e1..35428f31bd3 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java
@@ -113,7 +113,9 @@ public class HapiTransactionService {
 				}
 
 				if (maxRetries > 0) {
-					ourLog.info("Max retries ({}) exceeded for version conflict", maxRetries);
+					String msg = "Max retries (" + maxRetries + ") exceeded for version conflict: " + e.getMessage();
+					ourLog.info(msg, maxRetries);
+					throw new ResourceVersionConflictException(msg);
 				}
 
 				throw e;