diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index e4f994a925d698cdc2685d921bc18d7248a2ec33..137ca657a8fe327ca5dd1131b9d2a1dc2566a2fa 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -2480,6 +2480,8 @@ function _M:onTakeoff(o, bypass_set)
 end
 
 function _M:checkMindstar(o)
+	if not o.psiblade_tile or not o.combat then return end
+
 	local new
 	local old
 
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index db2144ec9fbae9a82b5a754a082eb8939a7d81e6..c54ad323514e2cd6f21aa7b89e6b0f1170cf3185 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -1074,7 +1074,7 @@ function _M:onWear(o, bypass_set)
 	if not self.no_power_reset_on_wear then
 		o:forAllStack(function(so)
 			if so.power and so:attr("power_regen") then so.power = 0 end
-			if so.talent_cooldown then self.talents_cd[so.talent_cooldown] = math.max(self.talents_cd[so.talent_cooldown] or 0, math.min(4, math.floor((so.use_power or so.use_talent).power / 5))) end
+			if so.talent_cooldown then self.talents_cd[so.talent_cooldown] = math.max(self.talents_cd[so.talent_cooldown] or 0, math.min(4, math.floor((so.use_power or so.use_talent or {power=10}).power / 5))) end
 		end)
 	end
 end