diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXDatabaseContextDelegate.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXDatabaseContextDelegate.java
index 62ace2c9607..c5ead3b237f 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXDatabaseContextDelegate.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXDatabaseContextDelegate.java
@@ -197,7 +197,7 @@ public boolean databaseContextShouldHandleDatabaseException(EODatabaseContext da
 				throw e;
 			}
 			String exceptionsRegex = ERXProperties.stringForKeyWithDefault(ERX_ADAPTOR_EXCEPTIONS_REGEX, ERX_ADAPTOR_EXCEPTIONS_REGEX_DEFAULT);
-			if(!handled && throwable.getMessage() != null && exceptionsRegex.matches(throwable.getMessage())) {
+			if(!handled && throwable.getMessage() != null && throwable.getMessage().matches(exceptionsRegex)) {
 				NSArray models = databaseContext.database().models();
 				for(Enumeration e = models.objectEnumerator(); e.hasMoreElements(); ) {
 					EOModel model = (EOModel)e.nextElement();