diff --git a/src/net/java/sip/communicator/launcher/SIPCommunicator.java b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
index 6353fc4d0..ce03a1de6 100644
--- a/src/net/java/sip/communicator/launcher/SIPCommunicator.java
+++ b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
@@ -203,7 +203,10 @@ static void setScHomeDir(String osName)
 
         boolean isHomeDirnameForced = name != null;
 
-        if (profileLocation == null || name == null)
+        if (profileLocation == null
+            || cacheLocation == null
+            || logLocation == null
+            || name == null)
         {
             String defaultLocation = System.getProperty("user.home");
             String defaultName = ".jitsi";