diff --git a/headphones/__init__.py b/headphones/__init__.py
index a9f9223e..30fa5902 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -584,7 +584,7 @@ def launch_browser(host, port, root):
 
 def config_write():
 
-    new_config = ConfigObj()
+    new_config = ConfigObj(encoding="UTF-8")
     new_config.filename = CONFIG_FILE
 
     new_config['General'] = {}
diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py
index a78e753e..33caeda9 100644
--- a/headphones/postprocessor.py
+++ b/headphones/postprocessor.py
@@ -676,7 +676,7 @@ def renameFiles(albumpath, downloaded_track_list, release):
             logger.debug("Renaming for: " + downloaded_track.decode(headphones.SYS_ENCODING) + " is not neccessary")
             continue
 
-        logger.debug('Renaming %s ---> %s' % (downloaded_track.decode(headphones.SYS_ENCODING), new_file_name.decode(headphones.SYS_ENCODING)))
+        logger.debug('Renaming %s ---> %s' % (downloaded_track.decode(headphones.SYS_ENCODING,'replace'), new_file_name.decode(headphones.SYS_ENCODING,'replace')))
         try:
             os.rename(downloaded_track, new_file)
         except Exception, e: