diff --git a/mopidy/exceptions.py b/mopidy/exceptions.py
deleted file mode 100644
index 8f352807..00000000
--- a/mopidy/exceptions.py
+++ /dev/null
@@ -1,6 +0,0 @@
-class MpdAckError(Exception):
-    pass
-
-class MpdNotImplemented(MpdAckError):
-    def __init__(self, *args):
-        super(MpdNotImplemented, self).__init__(u'Not implemented', *args)
diff --git a/mopidy/mpd/__init__.py b/mopidy/mpd/__init__.py
index e69de29b..8f352807 100644
--- a/mopidy/mpd/__init__.py
+++ b/mopidy/mpd/__init__.py
@@ -0,0 +1,6 @@
+class MpdAckError(Exception):
+    pass
+
+class MpdNotImplemented(MpdAckError):
+    def __init__(self, *args):
+        super(MpdNotImplemented, self).__init__(u'Not implemented', *args)
diff --git a/mopidy/mpd/handler.py b/mopidy/mpd/handler.py
index 669fe399..981307d5 100644
--- a/mopidy/mpd/handler.py
+++ b/mopidy/mpd/handler.py
@@ -15,7 +15,7 @@ import logging
 import re
 import sys
 
-from mopidy.exceptions import MpdAckError, MpdNotImplemented
+from mopidy.mpd import MpdAckError, MpdNotImplemented
 
 logger = logging.getLogger('mpd.handler')
 
diff --git a/mopidy/mpd/session.py b/mopidy/mpd/session.py
index d7ecfeaa..19d8c1c5 100644
--- a/mopidy/mpd/session.py
+++ b/mopidy/mpd/session.py
@@ -2,7 +2,7 @@ import asynchat
 import logging
 
 from mopidy import get_mpd_protocol_version
-from mopidy.exceptions import MpdAckError
+from mopidy.mpd import MpdAckError
 from mopidy.mpd.handler import MpdHandler
 
 logger = logging.getLogger(u'mpd.session')
diff --git a/tests/mpd/handlertest.py b/tests/mpd/handlertest.py
index 2274851a..0d8e97f1 100644
--- a/tests/mpd/handlertest.py
+++ b/tests/mpd/handlertest.py
@@ -2,10 +2,9 @@ import datetime as dt
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
-from mopidy.exceptions import MpdAckError
 from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Track, Playlist
-from mopidy.mpd import handler
+from mopidy.mpd import handler, MpdAckError
 
 class DummySession(object):
     def do_close(self):