diff --git a/gns3server/config.py b/gns3server/config.py
index 9bcc9038..3f69575a 100644
--- a/gns3server/config.py
+++ b/gns3server/config.py
@@ -135,7 +135,7 @@ class Config(object):
         Read the configuration files.
         """
 
-        parsed_files = self._config.read(self._files)
+        parsed_files = self._config.read(self._files, encoding="utf-8")
         if not parsed_files:
             log.warning("No configuration file could be found or read")
         else:
diff --git a/gns3server/handlers/upload_handler.py b/gns3server/handlers/upload_handler.py
index 22d83b2c..9a431276 100644
--- a/gns3server/handlers/upload_handler.py
+++ b/gns3server/handlers/upload_handler.py
@@ -36,8 +36,9 @@ class UploadHandler:
         try:
             for root, _, files in os.walk(UploadHandler.image_directory()):
                 for filename in files:
-                    image_file = os.path.join(root, filename)
-                    uploaded_files.append(image_file)
+                    if not filename.startswith("."):
+                        image_file = os.path.join(root, filename)
+                        uploaded_files.append(image_file)
         except OSError:
             pass
         iourc_path = os.path.join(os.path.expanduser("~/"), ".iourc")