diff --git a/plugin-git/che-plugin-git-provider-che/src/main/java/org/eclipse/che/ide/ext/git/server/nativegit/CheAccessTokenCredentialProvider.java b/plugin-git/che-plugin-git-provider-che/src/main/java/org/eclipse/che/ide/ext/git/server/nativegit/CheAccessTokenCredentialProvider.java
index aee9b2d7e..46d54badb 100644
--- a/plugin-git/che-plugin-git-provider-che/src/main/java/org/eclipse/che/ide/ext/git/server/nativegit/CheAccessTokenCredentialProvider.java
+++ b/plugin-git/che-plugin-git-provider-che/src/main/java/org/eclipse/che/ide/ext/git/server/nativegit/CheAccessTokenCredentialProvider.java
@@ -12,7 +12,7 @@
 
 import org.eclipse.che.api.core.ServerException;
 import org.eclipse.che.api.git.CredentialsProvider;
-import org.eclipse.che.api.git.GitException;
+import org.eclipse.che.api.git.exception.GitException;;
 import org.eclipse.che.api.git.UserCredential;
 import org.eclipse.che.api.git.shared.GitUser;
 import org.eclipse.che.api.user.server.dao.PreferenceDao;
diff --git a/plugin-github/che-plugin-github-ext-github/src/main/java/org/eclipse/che/ide/ext/github/server/rest/GitHubService.java b/plugin-github/che-plugin-github-ext-github/src/main/java/org/eclipse/che/ide/ext/github/server/rest/GitHubService.java
index 2e47d4d1e..62cefd120 100644
--- a/plugin-github/che-plugin-github-ext-github/src/main/java/org/eclipse/che/ide/ext/github/server/rest/GitHubService.java
+++ b/plugin-github/che-plugin-github-ext-github/src/main/java/org/eclipse/che/ide/ext/github/server/rest/GitHubService.java
@@ -12,7 +12,7 @@
 
 import org.eclipse.che.api.core.ApiException;
 import org.eclipse.che.api.core.ServerException;
-import org.eclipse.che.api.git.GitException;
+import org.eclipse.che.api.git.exception.GitException;;
 import org.eclipse.che.ide.ext.github.server.GitHubDTOFactory;
 import org.eclipse.che.ide.ext.github.server.GitHubFactory;
 import org.eclipse.che.ide.ext.github.server.GitHubKeyUploader;
diff --git a/plugin-github/che-plugin-github-provider-github/src/main/java/org/eclipse/che/ide/ext/git/server/nativegit/GitHubOAuthCredentialProvider.java b/plugin-github/che-plugin-github-provider-github/src/main/java/org/eclipse/che/ide/ext/git/server/nativegit/GitHubOAuthCredentialProvider.java
index 0ab4121e0..364f8946e 100644
--- a/plugin-github/che-plugin-github-provider-github/src/main/java/org/eclipse/che/ide/ext/git/server/nativegit/GitHubOAuthCredentialProvider.java
+++ b/plugin-github/che-plugin-github-provider-github/src/main/java/org/eclipse/che/ide/ext/git/server/nativegit/GitHubOAuthCredentialProvider.java
@@ -11,7 +11,7 @@
 package org.eclipse.che.ide.ext.git.server.nativegit;
 
 import org.eclipse.che.api.auth.shared.dto.OAuthToken;
-import org.eclipse.che.api.git.GitException;
+import org.eclipse.che.api.git.exception.GitException;;
 import org.eclipse.che.api.git.shared.GitUser;
 import org.eclipse.che.commons.env.EnvironmentContext;
 import org.eclipse.che.dto.server.DtoFactory;
diff --git a/plugin-ssh/che-plugin-ssh-git-jgit/src/main/java/org/eclipse/che/git/impl/jgit/ssh/SshKeyProviderImpl.java b/plugin-ssh/che-plugin-ssh-git-jgit/src/main/java/org/eclipse/che/git/impl/jgit/ssh/SshKeyProviderImpl.java
index d7ac7c5be..c0b087ab5 100644
--- a/plugin-ssh/che-plugin-ssh-git-jgit/src/main/java/org/eclipse/che/git/impl/jgit/ssh/SshKeyProviderImpl.java
+++ b/plugin-ssh/che-plugin-ssh-git-jgit/src/main/java/org/eclipse/che/git/impl/jgit/ssh/SshKeyProviderImpl.java
@@ -12,7 +12,7 @@
 
 import com.google.inject.Inject;
 
-import org.eclipse.che.api.git.GitException;
+import org.eclipse.che.api.git.exception.GitException;;
 import org.eclipse.che.api.git.GitUrlUtils;
 import org.eclipse.che.ide.ext.ssh.server.SshKey;
 import org.eclipse.che.ide.ext.ssh.server.SshKeyStore;
diff --git a/plugin-ssh/che-plugin-ssh-git-native/src/main/java/org/eclipse/che/git/impl/nativegit/ssh/SshKeyProviderImpl.java b/plugin-ssh/che-plugin-ssh-git-native/src/main/java/org/eclipse/che/git/impl/nativegit/ssh/SshKeyProviderImpl.java
index 7d7f2ef23..866d95f8d 100644
--- a/plugin-ssh/che-plugin-ssh-git-native/src/main/java/org/eclipse/che/git/impl/nativegit/ssh/SshKeyProviderImpl.java
+++ b/plugin-ssh/che-plugin-ssh-git-native/src/main/java/org/eclipse/che/git/impl/nativegit/ssh/SshKeyProviderImpl.java
@@ -13,7 +13,7 @@
 import com.google.inject.Inject;
 
 import org.eclipse.che.api.core.UnauthorizedException;
-import org.eclipse.che.api.git.GitException;
+import org.eclipse.che.api.git.exception.GitException;;
 import org.eclipse.che.api.git.GitUrlUtils;
 import org.eclipse.che.ide.ext.ssh.server.SshKey;
 import org.eclipse.che.ide.ext.ssh.server.SshKeyStore;