diff --git a/Bartender4.lua b/Bartender4.lua
index 06b6bee..aec060a 100644
--- a/Bartender4.lua
+++ b/Bartender4.lua
@@ -176,14 +176,14 @@ function Bartender4:UpdateBlizzardVehicle()
 			end)
 		end
 	else
-		MainMenuBarArtFrame:RegisterEvent("UNIT_ENTERING_VEHICLE")
-		MainMenuBarArtFrame:RegisterEvent("UNIT_ENTERED_VEHICLE")
-		MainMenuBarArtFrame:RegisterEvent("UNIT_EXITING_VEHICLE")
-		MainMenuBarArtFrame:RegisterEvent("UNIT_EXITED_VEHICLE")
+		MainMenuBarArtFrame:UnregisterEvent("UNIT_ENTERING_VEHICLE")
+		MainMenuBarArtFrame:UnregisterEvent("UNIT_ENTERED_VEHICLE")
+		MainMenuBarArtFrame:UnregisterEvent("UNIT_EXITING_VEHICLE")
+		MainMenuBarArtFrame:UnregisterEvent("UNIT_EXITED_VEHICLE")
 
 		local vehicleModule = Bartender4:GetModule("Vehicle")
 		vehicleModule.blizzardVehicle = nil
-		if vehicleModule.db.profile.enabled then
+		if vehicleModule.db and vehicleModule.db.profile.enabled then
 			vehicleModule:Enable()
 		end
 	end