diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/app/WorkspaceService.java b/src/main/java/dev/mateuszkowalczyk/ffm/app/WorkspaceService.java
index acadbd1..b949eac 100644
--- a/src/main/java/dev/mateuszkowalczyk/ffm/app/WorkspaceService.java
+++ b/src/main/java/dev/mateuszkowalczyk/ffm/app/WorkspaceService.java
@@ -1,5 +1,6 @@
 package dev.mateuszkowalczyk.ffm.app;
 
+import dev.mateuszkowalczyk.ffm.app.cache.CacheService;
 import dev.mateuszkowalczyk.ffm.data.Chooser;
 import dev.mateuszkowalczyk.ffm.data.DatabaseService;
 import dev.mateuszkowalczyk.ffm.utils.PropertiesLoader;
@@ -14,6 +15,7 @@ public class WorkspaceService {
     private static final WorkspaceService instance = new WorkspaceService();
     private PropertiesLoader propertiesLoader = PropertiesLoader.getInstance();
     private DatabaseService databaseService = DatabaseService.getInstance();
+    private CacheService cacheService = CacheService.getInstance();
     private MainPageController mainPageController;
 
     private WorkspaceService() {
@@ -36,6 +38,7 @@ public class WorkspaceService {
         String path = chooser.chooseDirectory();
 
         this.propertiesLoader.set(Property.PATH_TO_DIRECTORY, path);
+        this.cacheService.check();
         try {
             StageController.getInstance().setScene(SceneEnum.MainPage);
         } catch (IOException e) {
diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/app/cache/CacheService.java b/src/main/java/dev/mateuszkowalczyk/ffm/app/cache/CacheService.java
index 94dd522..80cfb5f 100644
--- a/src/main/java/dev/mateuszkowalczyk/ffm/app/cache/CacheService.java
+++ b/src/main/java/dev/mateuszkowalczyk/ffm/app/cache/CacheService.java
@@ -4,11 +4,15 @@ public class CacheService {
     private static final CacheService instance = new CacheService();
 
     private CacheService () {
-        CacheStructureChecker cacheStructureChecker = new CacheStructureChecker();
-        cacheStructureChecker.check();
+       this.check();
     }
 
     public static CacheService getInstance() {
         return instance;
     }
+
+    public void check() {
+        CacheStructureChecker cacheStructureChecker = new CacheStructureChecker();
+        cacheStructureChecker.check();
+    }
 }
diff --git a/src/main/java/dev/mateuszkowalczyk/ffm/app/cache/CacheStructureChecker.java b/src/main/java/dev/mateuszkowalczyk/ffm/app/cache/CacheStructureChecker.java
index 8cbe6dc..30f3412 100644
--- a/src/main/java/dev/mateuszkowalczyk/ffm/app/cache/CacheStructureChecker.java
+++ b/src/main/java/dev/mateuszkowalczyk/ffm/app/cache/CacheStructureChecker.java
@@ -9,13 +9,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CacheStructureChecker {
-    private String path = PropertiesLoader.getInstance().get(Property.PATH_TO_DIRECTORY) + "/.cache";
+    private String path;
     private List<String> listToCheck = new ArrayList<String>();
 
     public void check() {
-        this.setupPathsToCheck();
+         this.path = PropertiesLoader.getInstance().get(Property.PATH_TO_DIRECTORY);
 
-        this.listToCheck.forEach(s -> this.checkDirectory(s));
+        if (this.path != null) {
+            this.path += "/.cache";
+            this.setupPathsToCheck();
+            this.listToCheck.forEach(s -> this.checkDirectory(s));
+        }
     }
 
     private void setupPathsToCheck() {