diff --git a/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp b/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp
index 1f8071908..619c6382b 100644
--- a/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp
+++ b/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp
@@ -192,7 +192,8 @@ void PendingTasksManager::checkForFinishedTasks(Poco::Timer& timer)
 				auto json = transaction->getModel()->getResultJson();
 				bool removeIt = false;
 				if (!json.isNull()) {
-					if (json->get("state").toString() == "success") {
+					auto state = json->get("state");
+					if (!state.isEmpty() && state.toString() == "success") {
 						removeIt = true;
 					}
 				}
diff --git a/login_server/src/proto b/login_server/src/proto
index ff412f735..924b51c87 160000
--- a/login_server/src/proto
+++ b/login_server/src/proto
@@ -1 +1 @@
-Subproject commit ff412f735667b30233c0ce00d461f209ac7dde7c
+Subproject commit 924b51c87fea29d5aaf053af43251dab44c2eeb7