diff --git a/src/libufc-connector/flightconnector.cpp b/src/libufc-connector/flightconnector.cpp
index b360b37..0318a6f 100644
--- a/src/libufc-connector/flightconnector.cpp
+++ b/src/libufc-connector/flightconnector.cpp
@@ -173,7 +173,7 @@ void FlightConnector::wait() const
             // Ignore
         }
     }
-    if (m_updateDataSourceThread)
+    if (m_updateDataSourceThread && m_updateDataSourceThread->joinable())
     {
         try
         {
@@ -234,7 +234,15 @@ void FlightConnector::loadConfig(const Config& config)
     bool writeConfig = false;
     if (config.configPath.empty())
     {
-        m_config.configPath = string(getenv("HOME")) + "/.config/ufc.yml";
+        const char* home = getenv("HOME");
+        if (home != nullptr)
+        {
+            m_config.configPath = string(home) + "/.config/ufc.yml";
+        }
+        else
+        {
+            m_config.configPath = "./ufc.yml";
+        }
         writeConfig = true;
     }
     else