diff --git a/vmware_nsx/neutron/plugins/vmware/api_client/client.py b/vmware_nsx/neutron/plugins/vmware/api_client/client.py
index 08f7763391..2c329bc20e 100644
--- a/vmware_nsx/neutron/plugins/vmware/api_client/client.py
+++ b/vmware_nsx/neutron/plugins/vmware/api_client/client.py
@@ -19,10 +19,11 @@ import httplib
 
 from neutron.i18n import _LE
 from neutron.openstack.common import log as logging
-from neutron.plugins.vmware.api_client import exception
+
 from vmware_nsx.neutron.plugins.vmware.api_client import base
 from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_client
 from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_request
+from vmware_nsx.neutron.plugins.vmware.api_client import exception
 from vmware_nsx.neutron.plugins.vmware.api_client import version
 
 LOG = logging.getLogger(__name__)
diff --git a/vmware_nsx/neutron/plugins/vmware/common/nsx_utils.py b/vmware_nsx/neutron/plugins/vmware/common/nsx_utils.py
index 06020ac244..a8fc9c5495 100644
--- a/vmware_nsx/neutron/plugins/vmware/common/nsx_utils.py
+++ b/vmware_nsx/neutron/plugins/vmware/common/nsx_utils.py
@@ -19,8 +19,9 @@ from neutron.extensions import multiprovidernet as mpnet
 from neutron.extensions import providernet as pnet
 from neutron.i18n import _LW
 from neutron.openstack.common import log
-from neutron.plugins.vmware.api_client import exception as api_exc
+
 from vmware_nsx.neutron.plugins.vmware.api_client import client
+from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
 from vmware_nsx.neutron.plugins.vmware.common import utils as vmw_utils
 from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db
 from vmware_nsx.neutron.plugins.vmware.dbexts import networkgw_db
diff --git a/vmware_nsx/neutron/plugins/vmware/common/sync.py b/vmware_nsx/neutron/plugins/vmware/common/sync.py
index 4deed66851..d99df5f36c 100644
--- a/vmware_nsx/neutron/plugins/vmware/common/sync.py
+++ b/vmware_nsx/neutron/plugins/vmware/common/sync.py
@@ -28,8 +28,9 @@ from neutron.extensions import l3
 from neutron.i18n import _LE, _LI, _LW
 from neutron.openstack.common import log
 from neutron.openstack.common import loopingcall
-from neutron.plugins.vmware.api_client import exception as api_exc
-from neutron.plugins.vmware.common import exceptions as nsx_exc
+
+from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
+from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
 from vmware_nsx.neutron.plugins.vmware.common import nsx_utils
 from vmware_nsx.neutron.plugins.vmware import nsxlib
 from vmware_nsx.neutron.plugins.vmware.nsxlib import router as routerlib
diff --git a/vmware_nsx/neutron/plugins/vmware/dbexts/nsxv_db.py b/vmware_nsx/neutron/plugins/vmware/dbexts/nsxv_db.py
index 9c4a330391..ff14fac79a 100644
--- a/vmware_nsx/neutron/plugins/vmware/dbexts/nsxv_db.py
+++ b/vmware_nsx/neutron/plugins/vmware/dbexts/nsxv_db.py
@@ -22,8 +22,9 @@ from sqlalchemy.sql import expression as expr
 import neutron.db.api as db
 from neutron.i18n import _, _LE
 from neutron.openstack.common import log as logging
-from neutron.plugins.vmware.common import exceptions as nsx_exc
 from neutron.plugins.vmware.dbexts import nsxv_models
+
+from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
 from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants
 from vmware_nsx.neutron.plugins.vmware.vshield.common import constants
 
diff --git a/vmware_nsx/neutron/plugins/vmware/plugins/managers.py b/vmware_nsx/neutron/plugins/vmware/plugins/managers.py
index 292c01eba6..d6aa003724 100644
--- a/vmware_nsx/neutron/plugins/vmware/plugins/managers.py
+++ b/vmware_nsx/neutron/plugins/vmware/plugins/managers.py
@@ -17,7 +17,8 @@ from oslo.config import cfg
 import stevedore
 
 from neutron.openstack.common import log
-from neutron.plugins.vmware.common import exceptions as nsx_exc
+
+from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
 
 
 LOG = log.getLogger(__name__)
diff --git a/vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py b/vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py
index 508c246b71..97e10dd754 100644
--- a/vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py
+++ b/vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py
@@ -48,7 +48,6 @@ from neutron.extensions import securitygroup as ext_sg
 from neutron.i18n import _LE, _LW
 from neutron.openstack.common import log as logging
 from neutron.openstack.common import uuidutils
-from neutron.plugins.vmware.common import exceptions as nsx_exc
 from neutron.plugins.vmware.extensions import (
     advancedserviceproviders as as_providers)
 from neutron.plugins.vmware.extensions import (
@@ -56,6 +55,7 @@ from neutron.plugins.vmware.extensions import (
 
 from vmware_nsx.neutron.plugins import vmware
 from vmware_nsx.neutron.plugins.vmware.common import config  # noqa
+from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
 from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils
 from vmware_nsx.neutron.plugins.vmware.dbexts import (
     routertype as rt_rtr)
diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_sync.py b/vmware_nsx/neutron/tests/unit/vmware/test_nsx_sync.py
index a9ea96e801..3781442c54 100644
--- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_sync.py
+++ b/vmware_nsx/neutron/tests/unit/vmware/test_nsx_sync.py
@@ -27,11 +27,12 @@ from neutron.common import exceptions as n_exc
 from neutron import context
 from neutron.extensions import l3
 from neutron.openstack.common import log
-from neutron.plugins.vmware.api_client import exception as api_exc
 from neutron.tests import base
 from neutron.tests.unit import test_api_v2
 from neutron.tests.unit import testlib_api
+
 from vmware_nsx.neutron.plugins.vmware.api_client import client
+from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
 from vmware_nsx.neutron.plugins.vmware.api_client import version
 from vmware_nsx.neutron.plugins.vmware.common import sync
 from vmware_nsx.neutron.plugins.vmware.dbexts import db