diff --git a/source/Sagan-Core/CriteriaBasedConflictCheckingStrategy.class.st b/source/Sagan-Core/CriteriaBasedConflictCheckingStrategy.class.st
index ec5246b..15f24cd 100644
--- a/source/Sagan-Core/CriteriaBasedConflictCheckingStrategy.class.st
+++ b/source/Sagan-Core/CriteriaBasedConflictCheckingStrategy.class.st
@@ -23,11 +23,8 @@ Class {
 { #category : 'instance creation' }
 CriteriaBasedConflictCheckingStrategy class >> accordingTo: aBlockOrMatchingCriteria [
 
-	^ self
-		  accordingTo: aBlockOrMatchingCriteria
-		  explainingConflictWith: [ :objectInMemory | 
-			  'Something is in conflict with <1p>' expandMacrosWith:
-				  objectInMemory ]
+  ^ self accordingTo: aBlockOrMatchingCriteria explainingConflictWith: [ :objectInMemory |
+        'Something is in conflict with {1}' localizedWithAll: { objectInMemory printString } ]
 ]
 
 { #category : 'instance creation' }
diff --git a/source/Sagan-Core/RepositoryBehavior.class.st b/source/Sagan-Core/RepositoryBehavior.class.st
index 48a8897..a6176e3 100644
--- a/source/Sagan-Core/RepositoryBehavior.class.st
+++ b/source/Sagan-Core/RepositoryBehavior.class.st
@@ -43,10 +43,13 @@ RepositoryBehavior >> assertBoundariesAreValidFrom: aStartingPosition upTo: aMax
 { #category : 'private - preconditions' }
 RepositoryBehavior >> assertIncludes: inMemoryObject [
 
-	AssertionChecker
-		enforce: [ ( self countMatching: [ :objectInRepository :criteria | criteria does: objectInRepository equal: inMemoryObject ] ) strictlyPositive ]
-		because: [ '<1p> was not found.' expandMacrosWith: inMemoryObject ]
-		raising: ObjectNotFound
+  AssertionChecker
+    enforce: [
+        ( self countMatching: [ :objectInRepository :criteria |
+              criteria does: objectInRepository equal: inMemoryObject ] ) strictlyPositive
+      ]
+    because: [ '{1} was not found.' localizedWithAll: { inMemoryObject printString } ]
+    raising: ObjectNotFound
 ]
 
 { #category : 'private - preconditions' }