diff --git a/bin/app/data/projects/tictactoe/src/human_player.h b/bin/app/data/projects/tictactoe/src/human_player.h
index a2039fa3..afa98d55 100644
--- a/bin/app/data/projects/tictactoe/src/human_player.h
+++ b/bin/app/data/projects/tictactoe/src/human_player.h
@@ -3,6 +3,7 @@
 
 #include "player.h"
 
+
 class HumanPlayer : public Player {
 public:
 	HumanPlayer( Field::Token token, const char* name  );
diff --git a/src/lib/Project.cpp b/src/lib/Project.cpp
index 8d750633..f56376d2 100644
--- a/src/lib/Project.cpp
+++ b/src/lib/Project.cpp
@@ -150,18 +150,24 @@ void Project::parseCode()
 	utility::append(updatedFilePaths, m_storage->getDependingFilePaths(updatedFilePaths));
 	utility::append(updatedFilePaths, m_storage->getDependingFilePaths(removedFilePaths));
 
-	std::shared_ptr<TaskGroupSequential> taskSequential = std::make_shared<TaskGroupSequential>();
-
 	std::vector<FilePath> filesToClean;
 	filesToClean.insert(filesToClean.end(), removedFilePaths.begin(), removedFilePaths.end());
 	filesToClean.insert(filesToClean.end(), updatedFilePaths.begin(), updatedFilePaths.end());
 
-	taskSequential->addTask(std::make_shared<TaskCleanStorage>(m_storage.get(), filesToClean));
-
 	std::vector<FilePath> filesToParse;
 	filesToParse.insert(filesToParse.end(), addedFilePaths.begin(), addedFilePaths.end());
 	filesToParse.insert(filesToParse.end(), updatedFilePaths.begin(), updatedFilePaths.end());
 
+	m_state = PROJECT_LOADED;
+
+	if (!filesToClean.size() && !filesToParse.size())
+	{
+		MessageFinishedParsing(0, 0, 0, true).dispatch();
+		return;
+	}
+
+	std::shared_ptr<TaskGroupSequential> taskSequential = std::make_shared<TaskGroupSequential>();
+	taskSequential->addTask(std::make_shared<TaskCleanStorage>(m_storage.get(), filesToClean));
 
 	int indexerThreadCount = ApplicationSettings::getInstance()->getIndexerThreadCount();
 
@@ -189,8 +195,6 @@ void Project::parseCode()
 	}
 
 	Task::dispatch(taskSequential);
-
-	m_state = PROJECT_LOADED;
 }
 
 void Project::logStats() const
diff --git a/src/lib/data/TaskCleanStorage.cpp b/src/lib/data/TaskCleanStorage.cpp
index d1af5da3..c520f97f 100644
--- a/src/lib/data/TaskCleanStorage.cpp
+++ b/src/lib/data/TaskCleanStorage.cpp
@@ -33,7 +33,7 @@ Task::TaskState TaskCleanStorage::update()
 
 	if (m_fileCount)
 	{
-		MessageStatus("Cleaning up names (ESC to quit)", false, true).dispatch();
+		MessageStatus("Clearing caches (ESC to quit)", false, true).dispatch();
 		m_storage->clearCaches();
 	}