diff --git a/source/shared_lib/sources/platform/posix/miniftpclient.cpp b/source/shared_lib/sources/platform/posix/miniftpclient.cpp
index baea4590e..6b8b1c52b 100644
--- a/source/shared_lib/sources/platform/posix/miniftpclient.cpp
+++ b/source/shared_lib/sources/platform/posix/miniftpclient.cpp
@@ -245,7 +245,7 @@ FTP_Client_ResultType FTPClientThread::getTilesetFromServer(string tileSetName,
 
     FTP_Client_ResultType result = ftp_crt_FAIL;
 
-    string destFile = this->mapsPath.second;
+    string destFile = this->tilesetsPath.second;
 
     if(EndsWith(destFile,"/") == false && EndsWith(destFile,"\\") == false) {
         destFile += "/";
@@ -370,6 +370,10 @@ void FTPClientThread::execute() {
                     safeMutex.ReleaseLock();
                 }
 
+                if(this->getQuitStatus() == true) {
+                    break;
+                }
+
                 MutexSafeWrapper safeMutex2(&mutexTilesetList);
                 if(tilesetList.size() > 0) {
                     string tileset = tilesetList[0];