diff --git a/correction.lua b/correction.lua
index 93699c9..4e5cad5 100644
--- a/correction.lua
+++ b/correction.lua
@@ -11,7 +11,7 @@ local C_MountJournal_GetMountInfoByID = _G.C_MountJournal.GetMountInfoByID
 local C_MountJournal_GetMountIDs = _G.C_MountJournal.GetMountIDs
 local GetShapeshiftFormID = _G.GetShapeshiftFormID
 local IsMounted = _G.IsMounted
-local UnitBuff = _G.UnitBuff
+local UnitBuff = C_TooltipInfo.GetUnitBuff
 local UnitClass = _G.UnitClass
 local UnitInVehicle = _G.UnitInVehicle
 local UnitGUID = _G.UnitGUID
@@ -477,4 +477,3 @@ function cosFix:CorrectShoulderOffset(enteringVehicleGuid)
   return returnValue
 
 end
-
diff --git a/events.lua b/events.lua
index 4ca870b..508beae 100644
--- a/events.lua
+++ b/events.lua
@@ -8,7 +8,24 @@ local tremove = _G.tremove
 local tinsert = _G.tinsert
 local unpack = _G.unpack
 
-local C_MountJournal_GetMountInfoByID = _G.C_MountJournal.GetMountInfoByID
+local function SafeMountInfoByID(mountID)
+    if not mountID or type(mountID) ~= "number" then
+        return nil, nil, nil, nil, nil
+    end
+
+    local f
+    if C_MountJournal then
+        f = C_MountJournal.GetMountInfoByID or C_MountJournal.GetMountInfo
+    end
+
+    if f then
+        return f(mountID)
+    end
+
+    return nil, nil, nil, nil, nil
+end
+
+local C_MountJournal_GetMountInfoByID = SafeMountInfoByID
 local GetShapeshiftFormID = _G.GetShapeshiftFormID
 local InCombatLockdown = _G.InCombatLockdown
 local IsIndoors = _G.IsIndoors
@@ -907,3 +924,4 @@ function cosFix:RegisterEvents()
 
 end
 
+