diff --git a/[core]/es_extended/locale.lua b/[core]/es_extended/locale.lua
index 18120067..37c7e091 100644
--- a/[core]/es_extended/locale.lua
+++ b/[core]/es_extended/locale.lua
@@ -2,8 +2,7 @@ Locales = {}
 
 function Translate(str, ...)  -- Translate string
 	if not str then
-		local currentResourceName = GetCurrentResourceName()
-		print(("[^1ERROR^7] Resource ^5%s^7 You did not specify a parameter for the Translate function or the value is nil!"):format(currentResourceName))
+		print(("[^1ERROR^7] Resource ^5%s^7 You did not specify a parameter for the Translate function or the value is nil!"):format(GetInvokingResource() or GetCurrentResourceName()))
 		return 'Given translate function parameter is nil!'
 	end
 	if Locales[Config.Locale] then
diff --git a/[core]/esx_menu_default/client/main.lua b/[core]/esx_menu_default/client/main.lua
index 463a1cd9..62b5f6a7 100644
--- a/[core]/esx_menu_default/client/main.lua
+++ b/[core]/esx_menu_default/client/main.lua
@@ -14,8 +14,10 @@ end
 
 local function closeMenu(namespace, name)
     CurrentNameSpace = namespace
-    if OpenedMenus < 1 then return end
-    OpenedMenus = OpenedMenus - 1
+    OpenedMenus -= 1
+    if OpenedMenus < 0 then
+        OpenedMenus = 0
+    end
     SendNUIMessage({
         action = 'closeMenu',
         namespace = namespace,