diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/repository/BranchNotFoundException.java b/modules/core/core-api/src/main/java/com/enonic/xp/repository/BranchNotFoundException.java
index 1ab564ef3a5..dd0325c1f87 100644
--- a/modules/core/core-api/src/main/java/com/enonic/xp/repository/BranchNotFoundException.java
+++ b/modules/core/core-api/src/main/java/com/enonic/xp/repository/BranchNotFoundException.java
@@ -1,10 +1,10 @@
 package com.enonic.xp.repository;
 
 import com.enonic.xp.branch.Branch;
-import com.enonic.xp.exception.BaseException;
+import com.enonic.xp.exception.NotFoundException;
 
 public class BranchNotFoundException
-    extends BaseException
+    extends NotFoundException
 {
     public BranchNotFoundException( final Branch branch )
     {
diff --git a/modules/core/core-api/src/main/java/com/enonic/xp/repository/RepositoryNotFoundException.java b/modules/core/core-api/src/main/java/com/enonic/xp/repository/RepositoryNotFoundException.java
index 5973c3cd21f..7990a80f9f9 100644
--- a/modules/core/core-api/src/main/java/com/enonic/xp/repository/RepositoryNotFoundException.java
+++ b/modules/core/core-api/src/main/java/com/enonic/xp/repository/RepositoryNotFoundException.java
@@ -1,9 +1,9 @@
 package com.enonic.xp.repository;
 
-import com.enonic.xp.exception.BaseException;
+import com.enonic.xp.exception.NotFoundException;
 
 public class RepositoryNotFoundException
-    extends BaseException
+    extends NotFoundException
 {
     public RepositoryNotFoundException( final RepositoryId repositoryId )
     {