2 files changed, 2 insertions, 2 deletions
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp
index f7b953ad..a9182d52 100644
--- a/src/instancemanager.cpp
+++ b/src/instancemanager.cpp
@@ -196,7 +196,7 @@ QString InstanceManager::determineDataPath()
     }
   }
 
-  if (instanceId.isEmpty() || !QFileInfo::exists(dataPath)) {
+  if (instanceId.isEmpty()) {
     return qApp->applicationDirPath();
   } else {
     setCurrentInstance(instanceId);
diff --git a/src/main.cpp b/src/main.cpp
index e289453c..6b585b5c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -533,13 +533,13 @@ int runApplication(MOApplication &application, SingleInstance &instance,
         // pass the remaining parameters to the binary
         try {
           organizer.startApplication(exeName, arguments, QString(), QString());
+          return 0;
         } catch (const std::exception &e) {
           reportError(
               QObject::tr("failed to start application: %1").arg(e.what()));
           return 1;
         }
       }
-      return 0;
     }
 
     NexusInterface::instance()->getAccessManager()->startLoginCheck();