diff --git a/code/ryzom/client/src/client.cpp b/code/ryzom/client/src/client.cpp
index d6fc9f3ea..54549bb51 100644
--- a/code/ryzom/client/src/client.cpp
+++ b/code/ryzom/client/src/client.cpp
@@ -370,7 +370,7 @@ int main(int argc, char **argv)
 		"document settings"..... Force the path to be the path of the exe
 	*/
 	{
-#ifdef NL_FINAL_VERSION
+#ifdef FINAL_VERSION
 		char	str[4096];
 		uint	len= GetModuleFileName(NULL, str, 4096);
 		if(len && len<4096)
@@ -380,7 +380,7 @@ int main(int argc, char **argv)
 //			if(!path.empty())
 //				CPath::setCurrentPath(path.c_str());
 		}
-#endif // NL_FINAL_VERSION
+#endif // FINAL_VERSION
 	}
 
 	string sCmdLine = cmdline;
@@ -389,7 +389,10 @@ int main(int argc, char **argv)
 	{
 		HANDLE mutex = CreateMutex (NULL, false, "RyzomClient");
 		if (mutex && GetLastError() == ERROR_ALREADY_EXISTS)
-			exit (0);
+		{
+			delete appContext;
+			return 0;
+		}
 	}
 
 	initCrashReport ();
diff --git a/code/ryzom/client/src/user_entity.cpp b/code/ryzom/client/src/user_entity.cpp
index 7b6e6428f..bd93bcdd1 100644
--- a/code/ryzom/client/src/user_entity.cpp
+++ b/code/ryzom/client/src/user_entity.cpp
@@ -2194,9 +2194,9 @@ void CUserEntity::setDead()	// virtual
 	// get player's kami fame
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	sint8 kamiFame = 0;
-	uint kamiFameIndex = CStaticFames::getInstance().getFactionIndex("kami");	
+	uint kamiFameIndex = CStaticFames::getInstance().getFactionIndex("kami");
 	if (pIM && kamiFameIndex != CStaticFames::INVALID_FACTION_INDEX)
-	{		
+	{
 		CCDBNodeLeaf *pLeafKamiFame = pIM->getDbProp(toString("SERVER:FAME:PLAYER%d:VALUE", kamiFameIndex - 1), false);
 		if (pLeafKamiFame != NULL)
 			kamiFame = pLeafKamiFame->getValue8();
@@ -2210,8 +2210,8 @@ void CUserEntity::setDead()	// virtual
 		CCDBNodeLeaf *pLeafKaravanFame = pIM->getDbProp(toString("SERVER:FAME:PLAYER%d:VALUE", karavanFameIndex - 1), false);
 		if (pLeafKaravanFame != NULL)
 			karavanFame = pLeafKaravanFame->getValue8();
-	}		
-	
+	}
+
 	// set loading background depending on player's faction fame
 	if (kamiFame > karavanFame)
 		LoadingBackground = ResurectKamiBackground;