diff --git a/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java b/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
index 2669f7651e..90610773a4 100644
--- a/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
+++ b/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
@@ -257,11 +257,14 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
                   repository.getType());
     }
 
-    assertIsOwner(repository);
     AssertUtil.assertIsValid(repository);
 
-    if (repositoryDB.contains(repository))
+    Repository notModifiedRepository = repositoryDB.get(repository.getType(),
+                                         repository.getName());
+
+    if (notModifiedRepository != null)
     {
+      assertIsOwner(notModifiedRepository);
       getHandler(repository).modify(repository);
       repository.setLastModified(System.currentTimeMillis());