diff --git a/headphones/helpers.py b/headphones/helpers.py
index ea8960f2..54bc3f06 100644
--- a/headphones/helpers.py
+++ b/headphones/helpers.py
@@ -860,6 +860,8 @@ def smartMove(src, dest, delete=True):
                 try:
                     os.rename(src, os.path.join(source_dir, newfile))
                     filename = newfile
+                    source_path = os.path.join(source_dir, filename)
+                    dest_path = os.path.join(dest, filename)
                 except Exception as e:
                     logger.warn(f"Error renaming {src}: {e}")
                 break
diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py
index 2b41bc12..4ba268fa 100755
--- a/headphones/postprocessor.py
+++ b/headphones/postprocessor.py
@@ -1231,9 +1231,9 @@ def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None, keep_orig
                     subfolders = helpers.expand_subfolders(path_to_folder)
 
                     if expand_subfolders and subfolders is not None:
-                        folders.extend(subfolders)
+                        folders.extend(subfolders.decode(headphones.SYS_ENCODING, 'replace'))
                     else:
-                        folders.append(path_to_folder)
+                        folders.append(path_to_folder.decode(headphones.SYS_ENCODING, 'replace'))
 
     # Log number of folders
     if folders: