diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index eb4f4d216606101f0e6dd4cebf5b7a665e57a273..faec84769e0b6f883825c1ff2f89e60ce68a21f9 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -51,10 +51,12 @@ from caosdb.connection.encode import MultipartParam, multipart_encode
 from caosdb.exceptions import (AmbiguityException,
                                AuthorizationException,
                                CaosDBException, ConnectionException,
-                               ConsistencyError, EmptyUniqueQueryError,
+                               ConsistencyError,
+                               EmptyUniqueQueryError,
                                EntityDoesNotExistError, EntityError,
                                EntityHasNoDatatypeError,
-                               TransactionError, QueryNotUniqueError,
+                               MismatchingEntitiesError,
+                               QueryNotUniqueError, TransactionError,
                                UniqueNamesError,
                                UnqualifiedParentsError,
                                UnqualifiedPropertiesError,
@@ -2675,7 +2677,7 @@ class Container(list):
                     local_entity.add_message(Message("Error", None, msg))
 
                     if raise_exception_on_error:
-                        raise AmbiguityException(msg)
+                        raise MismatchingEntitiesError(msg)
 
         ''' match by id '''
 
@@ -2700,7 +2702,7 @@ class Container(list):
                     local_entity.add_message(Message("Error", None, msg))
 
                     if raise_exception_on_error:
-                        raise AmbiguityException(msg)
+                        raise MismatchingEntitiesError(msg)
 
         ''' match by path '''
 
@@ -2730,7 +2732,7 @@ class Container(list):
                     local_entity.add_message(Message("Error", None, msg))
 
                     if raise_exception_on_error:
-                        raise AmbiguityException(msg)
+                        raise MismatchingEntitiesError(msg)
 
         ''' match by name '''
 
@@ -2760,7 +2762,7 @@ class Container(list):
                     local_entity.add_message(Message("Error", None, msg))
 
                     if raise_exception_on_error:
-                        raise AmbiguityException(msg)
+                        raise MismatchingEntitiesError(msg)
 
         # add remaining entities to this remote_container
         sync_remote_entities = []
@@ -2779,7 +2781,7 @@ class Container(list):
             remote_container.add_message(Message("Error", None, msg))
 
             if raise_exception_on_error:
-                raise AmbiguityException(msg)
+                raise MismatchingEntitiesError(msg)
 
         return sync_dict