diff --git a/client.lua b/client.lua
index d343dc8..52325a0 100644
--- a/client.lua
+++ b/client.lua
@@ -172,24 +172,25 @@ RegisterNUICallback('spawnplayer', function(data, cb)
     local insideMeta = PlayerData.metadata['inside']
     if type == 'current' then
         PreSpawnPlayer()
+    
         QBCore.Functions.GetPlayerData(function(pd)
             ped = PlayerPedId()
             SetEntityCoords(ped, pd.position.x, pd.position.y, pd.position.z)
             SetEntityHeading(ped, pd.position.a)
             FreezeEntityPosition(ped, false)
-        end)
-
-        if insideMeta.house ~= nil then
-            local houseId = insideMeta.house
-            TriggerEvent('qb-houses:client:LastLocationHouse', houseId)
-        elseif insideMeta.apartment.apartmentType ~= nil or insideMeta.apartment.apartmentId ~= nil then
-            local apartmentType = insideMeta.apartment.apartmentType
-            local apartmentId = insideMeta.apartment.apartmentId
-            TriggerEvent('qb-apartments:client:LastLocationHouse', apartmentType, apartmentId)
-        end
-        TriggerServerEvent('QBCore:Server:OnPlayerLoaded')
-        TriggerEvent('QBCore:Client:OnPlayerLoaded')
-        PostSpawnPlayer()
+    
+            local insideMeta = pd.metadata and pd.metadata['inside'] or {}
+    
+            if insideMeta.house then
+                TriggerEvent('qb-houses:client:LastLocationHouse', insideMeta.house)
+            elseif insideMeta.apartment and insideMeta.apartment.apartmentType and insideMeta.apartment.apartmentId then
+                TriggerEvent('qb-apartments:client:LastLocationHouse', insideMeta.apartment.apartmentType, insideMeta.apartment.apartmentId)
+            end
+    
+            TriggerServerEvent('QBCore:Server:OnPlayerLoaded')
+            TriggerEvent('QBCore:Client:OnPlayerLoaded')
+            PostSpawnPlayer()
+        end)    
     elseif type == 'house' then
         PreSpawnPlayer()
         TriggerEvent('qb-houses:client:enterOwnedHouse', location)
diff --git a/locales/ua.lua b/locales/ua.lua
new file mode 100644
index 0000000..18a28e8
--- /dev/null
+++ b/locales/ua.lua
@@ -0,0 +1,12 @@
+local Translations = {
+    ui = {
+        last_location = "Останнє місце",
+        confirm = "Підтвердити",
+        where_would_you_like_to_start = "Звідки ви бажаєте розпочати?",
+    }
+}
+
+Lang = Lang or Locale:new({
+    phrases = Translations,
+    warnOnMissing = true
+})