diff --git a/buildozer/__init__.py b/buildozer/__init__.py
index 8bda3ed95..1e7ee9505 100644
--- a/buildozer/__init__.py
+++ b/buildozer/__init__.py
@@ -34,6 +34,7 @@
     # on windows, no fcntl
     fcntl = None
 
+from buildozer.exceptions import BuildozerCommandException
 from buildozer.jsonstore import JsonStore
 from buildozer.logger import Logger
 from buildozer.specparser import SpecParser
@@ -50,22 +51,6 @@ class ChromeDownloader(FancyURLopener):
 urlretrieve = ChromeDownloader().retrieve
 
 
-class BuildozerException(Exception):
-    '''
-    Exception raised for general situations buildozer cannot process.
-    '''
-    pass
-
-
-class BuildozerCommandException(BuildozerException):
-    '''
-    Exception raised when an external command failed.
-
-    See: `Buildozer.cmd()`.
-    '''
-    pass
-
-
 class Buildozer:
 
     standard_cmds = ('distclean', 'update', 'debug', 'release',
diff --git a/buildozer/scripts/client.py b/buildozer/scripts/client.py
index d7149a28d..4e9814d60 100644
--- a/buildozer/scripts/client.py
+++ b/buildozer/scripts/client.py
@@ -5,7 +5,9 @@
 '''
 
 import sys
-from buildozer import Buildozer, BuildozerCommandException, BuildozerException
+
+from buildozer import Buildozer
+from buildozer.exceptions import BuildozerCommandException, BuildozerException
 from buildozer.logger import Logger
 
 
diff --git a/buildozer/scripts/remote.py b/buildozer/scripts/remote.py
index 2caf643cf..693682062 100644
--- a/buildozer/scripts/remote.py
+++ b/buildozer/scripts/remote.py
@@ -13,26 +13,28 @@
 
 __all__ = ["BuildozerRemote"]
 
+from configparser import ConfigParser
+from os import makedirs, walk, getcwd
+from os.path import join, expanduser, realpath, exists, splitext
 import socket
+from select import select
 import sys
-from buildozer import (
-    Buildozer, BuildozerCommandException, BuildozerException, __version__)
-from buildozer.logger import Logger
 from sys import stdout, stdin, exit
-from select import select
-from os.path import join, expanduser, realpath, exists, splitext
-from os import makedirs, walk, getcwd
-from configparser import ConfigParser
 try:
     import termios
     has_termios = True
 except ImportError:
     has_termios = False
+
 try:
     import paramiko
 except ImportError:
     print('Paramiko missing: pip install paramiko')
 
+from buildozer import Buildozer, __version__
+from buildozer.exceptions import BuildozerCommandException, BuildozerException
+from buildozer.logger import Logger
+
 
 class BuildozerRemote(Buildozer):
     def run_command(self, args):
diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py
index 2922a23c0..cd81c8c60 100644
--- a/buildozer/targets/android.py
+++ b/buildozer/targets/android.py
@@ -20,25 +20,27 @@
 # doesn't support any newer NDK.
 DEFAULT_ANDROID_NDK_VERSION = '17c'
 
-import traceback
-import io
-import re
 import ast
-from sys import platform, executable
-from buildozer import BuildozerException
-from buildozer.logger import USE_COLOR
-from buildozer.target import Target
+from glob import glob
+import io
 from os import environ
 from os.path import exists, join, realpath, expanduser, basename, relpath
 from platform import architecture
-from shutil import copyfile, rmtree, which
+import re
 import shlex
-import pexpect
-from glob import glob
+from shutil import copyfile, rmtree, which
+from sys import platform, executable
 from time import sleep
+import traceback
 
-from buildozer.libs.version import parse
 from distutils.version import LooseVersion
+import pexpect
+
+from buildozer.exceptions import BuildozerException
+from buildozer.logger import USE_COLOR
+from buildozer.target import Target
+from buildozer.libs.version import parse
+
 
 # buildozer.spec tokens that used to exist but are now ignored
 DEPRECATED_TOKENS = (('app', 'android.sdk'), )
diff --git a/buildozer/targets/ios.py b/buildozer/targets/ios.py
index 3962e6a37..2576f4c12 100644
--- a/buildozer/targets/ios.py
+++ b/buildozer/targets/ios.py
@@ -2,12 +2,14 @@
 iOS target, based on kivy-ios project
 '''
 
-import sys
+
+from getpass import getpass
+from os.path import join, basename, expanduser, realpath
 import plistlib
-from buildozer import BuildozerCommandException
+import sys
+
+from buildozer.exceptions import BuildozerCommandException
 from buildozer.target import Target, no_config
-from os.path import join, basename, expanduser, realpath
-from getpass import getpass
 
 
 PHP_TEMPLATE = '''
diff --git a/tests/scripts/test_client.py b/tests/scripts/test_client.py
index 7c24bd5e5..4d8b5bb19 100644
--- a/tests/scripts/test_client.py
+++ b/tests/scripts/test_client.py
@@ -1,9 +1,10 @@
 import sys
 import unittest
-from buildozer import BuildozerCommandException
-from buildozer.scripts import client
 from unittest import mock
 
+from buildozer.exceptions import BuildozerCommandException
+from buildozer.scripts import client
+
 
 class TestClient(unittest.TestCase):
 
diff --git a/tests/targets/test_ios.py b/tests/targets/test_ios.py
index ca8023783..a833a8a42 100644
--- a/tests/targets/test_ios.py
+++ b/tests/targets/test_ios.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from buildozer import BuildozerCommandException
+from buildozer.exceptions import BuildozerCommandException
 from buildozer.targets.ios import TargetIos
 from tests.targets.utils import (
     init_buildozer,