diff --git a/bin/mopidy-scan b/bin/mopidy-scan
index b87e8eb9..b8b4fd3e 100755
--- a/bin/mopidy-scan
+++ b/bin/mopidy-scan
@@ -15,12 +15,12 @@ tracks = []
 def store(data):
     track = translator(data)
     tracks.append(track)
-    logging.debug('Added %s', track.uri)
+    logging.debug(u'Added %s', track.uri)
 
-def debug(uri, error):
-    logging.error('Failed %s: %s', uri, error)
+def debug(uri, error, debug):
+    logging.error(u'Failed %s: %s - %s', uri, error, debug)
 
-logging.info('Scanning %s', settings.LOCAL_MUSIC_PATH)
+logging.info(u'Scanning %s', settings.LOCAL_MUSIC_PATH)
 
 scanner = Scanner(settings.LOCAL_MUSIC_PATH, store, debug)
 try:
@@ -28,7 +28,7 @@ try:
 except KeyboardInterrupt:
     scanner.stop()
 
-logging.info('Done')
+logging.info(u'Done')
 
 for a in tracks_to_tag_cache_format(tracks):
     if len(a) == 1:
diff --git a/mopidy/scanner.py b/mopidy/scanner.py
index eade1ce5..17e8127d 100644
--- a/mopidy/scanner.py
+++ b/mopidy/scanner.py
@@ -90,8 +90,8 @@ class Scanner(object):
     def process_error(self, bus, message):
         if self.error_callback:
             uri = self.uribin.get_property('uri')
-            errors = message.parse_error()
-            self.error_callback(uri, errors)
+            error, debug = message.parse_error()
+            self.error_callback(uri, error, debug)
         self.next_uri()
 
     def get_duration(self):
diff --git a/tests/scanner_test.py b/tests/scanner_test.py
index b98c5aa9..b2f2f2fd 100644
--- a/tests/scanner_test.py
+++ b/tests/scanner_test.py
@@ -144,9 +144,9 @@ class ScannerTest(unittest.TestCase):
         uri = data['uri'][len('file://'):]
         self.data[uri] = data
 
-    def error_callback(self, uri, errors):
+    def error_callback(self, uri, error, debug):
         uri = uri[len('file://'):]
-        self.errors[uri] = errors
+        self.errors[uri] = (error, debug)
 
     def test_data_is_set(self):
         self.scan('scanner/simple')