diff --git a/src/MCP/MCPToolMutation.class.st b/src/MCP/MCPToolMutation.class.st
index 9042d8e..e6cfccd 100644
--- a/src/MCP/MCPToolMutation.class.st
+++ b/src/MCP/MCPToolMutation.class.st
@@ -46,24 +46,20 @@ MCPToolMutation >> addSupplementalDetailsForMutationError: anError to: details [
 	methodNode := self methodNodeFromError: cause.
 	methodNode ifNotNil: [
 		self addSupplementalSelectorFromMethodNode: methodNode to: details ].
-	(PharoCompatibility compilationAstFromException: cause) ifNotNil: [
-		:ast | self addSupplementalSelectorFromMethodNode: ast to: details ].
+	(PharoCompatibility compilationAstFromException: anError) ifNotNil: [ :ast |
+		self addSupplementalSelectorFromMethodNode: ast to: details ].
 	anError == cause ifFalse: [
-			methodNode := self methodNodeFromError: anError.
-			methodNode ifNotNil: [
-				self addSupplementalSelectorFromMethodNode: methodNode to: details ].
-			(PharoCompatibility compilationAstFromException: anError)
-				ifNotNil: [ :ast |
-				self addSupplementalSelectorFromMethodNode: ast to: details ] ].
+		methodNode := self methodNodeFromError: anError.
+		methodNode ifNotNil: [
+			self addSupplementalSelectorFromMethodNode: methodNode to: details ] ].
 	position := self positionFromError: cause.
 	position ifNotNil: [ details at: #position put: position ].
 	undeclaredVariableNode := self undeclaredVariableNodeFrom: cause.
 	undeclaredVariableNode ifNotNil: [
-			variableName := self undeclaredVariableNameFor: cause.
-			variableName ifNotNil: [
-				details at: #variableName put: variableName ].
-			(self startPositionFromNode: undeclaredVariableNode) ifNotNil: [
-				:start | details at: #position put: start ] ]
+		variableName := self undeclaredVariableNameFor: cause.
+		variableName ifNotNil: [ details at: #variableName put: variableName ].
+		(self startPositionFromNode: undeclaredVariableNode) ifNotNil: [ :start |
+			details at: #position put: start ] ]
 ]
 
 { #category : 'private - errors' }
@@ -326,12 +322,6 @@ MCPToolMutation >> mutationActionForErrorFromParsedRequest: mutationRequest rawR
 { #category : 'private - errors' }
 MCPToolMutation >> mutationFailureCauseFor: anError [
 
-	(PharoCompatibility
-		 noticeFromException: anError
-		 ifKindOfAnyNamed:
-			 #( OCUndeclaredVariableNotice OCUndeclaredVariableWarning
-			    OCSyntaxErrorNotice RBSyntaxErrorNotice SyntaxErrorNotification ))
-		ifNotNil: [ :notice | ^ notice ].
 	^ anError mcpMutationFailureNotice
 ]
 
@@ -621,19 +611,16 @@ MCPToolMutation >> undeclaredVariableNameFor: anError [
 { #category : 'private - errors' }
 MCPToolMutation >> undeclaredVariableNodeFrom: anError [
 
+	anError mcpNoticeNode ifNotNil: [ :node | ^ node ].
 	^ PharoCompatibility undeclaredVariableNodeFromException: anError
 ]
 
 { #category : 'private - errors' }
 MCPToolMutation >> undeclaredVariableNoticeFrom: anError [
 
-	(PharoCompatibility
-		 noticeFromException: anError
-		 ifKindOfAnyNamed:
-		 #( OCUndeclaredVariableNotice OCUndeclaredVariableWarning ))
-		ifNotNil: [ :notice | ^ notice ].
-	(#( 'OCUndeclaredVariableNotice' 'OCUndeclaredVariableWarning' )
-		 includes: anError class name asString) ifTrue: [ ^ anError ].
+	| notice |
+	notice := anError mcpMutationFailureNotice.
+	(self undeclaredVariableNodeFrom: notice) ifNotNil: [ ^ notice ].
 	^ nil
 ]
 
diff --git a/src/MCP/OCCodeError.extension.st b/src/MCP/OCCodeError.extension.st
index 1137762..788313c 100644
--- a/src/MCP/OCCodeError.extension.st
+++ b/src/MCP/OCCodeError.extension.st
@@ -21,5 +21,5 @@ OCCodeError >> mcpMutationFailureNotice [
 { #category : '*MCP' }
 OCCodeError >> mcpNoticeNode [
 
-	^ self node
+	^ PharoCompatibility undeclaredVariableNodeFromException: self
 ]
diff --git a/src/MCP/OCUndeclaredVariableWarning.extension.st b/src/MCP/OCUndeclaredVariableWarning.extension.st
index 84825d7..b1138c2 100644
--- a/src/MCP/OCUndeclaredVariableWarning.extension.st
+++ b/src/MCP/OCUndeclaredVariableWarning.extension.st
@@ -12,14 +12,8 @@ OCUndeclaredVariableWarning >> mcpMethodNode [
 	^ self methodNode
 ]
 
-{ #category : '*MCP' }
-OCUndeclaredVariableWarning >> mcpMutationFailureNotice [
-
-	^ self notice ifNil: [ self ]
-]
-
 { #category : '*MCP' }
 OCUndeclaredVariableWarning >> mcpNoticeNode [
 
-	^ self node
+	^ PharoCompatibility undeclaredVariableNodeFromException: self
 ]