diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index abb9fdc37c9..3e77be7d6e2 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -322,6 +322,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
 		if("recharge")
 			if(charge_counter == 0)
 				return 0
+			if(charge_max == 0)
+				return 1
 			return charge_counter / charge_max
 		if("charges")
 			if(charge_counter)
diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm
index 883b37f9d83..a3aa9919eb2 100644
--- a/code/game/gamemodes/shadowling/shadowling_abilities.dm
+++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm
@@ -1,20 +1,21 @@
 #define EMPOWERED_THRALL_LIMIT 5
 
 /obj/effect/proc_holder/spell/proc/shadowling_check(var/mob/living/carbon/human/H)
-	if(!H || !istype(H)) return
+	if(!H || !istype(H))
+		return
 	if(H.incorporeal_move == 1)
-		to_chat(usr, "<span class='warning'>You can't use abilities affecting others while you are traversing between worlds!</span>")
+		to_chat(H, "<span class='warning'>You can't use abilities affecting others while you are traversing between worlds!</span>")
 		return FALSE
 	if(isshadowling(H) && is_shadow(H))
 		return 1
 	if(isshadowlinglesser(H) && is_thrall(H))
 		return 1
-	if(!is_shadow_or_thrall(usr))
-		to_chat(usr, "<span class='warning'>You can't wrap your head around how to do this.</span>")
-	else if(is_thrall(usr))
-		to_chat(usr, "<span class='warning'>You aren't powerful enough to do this.</span>")
-	else if(is_shadow(usr))
-		to_chat(usr, "<span class='warning'>Your telepathic ability is suppressed. Hatch or use Rapid Re-Hatch first.</span>")
+	if(!is_shadow_or_thrall(H))
+		to_chat(H, "<span class='warning'>You can't wrap your head around how to do this.</span>")
+	else if(is_thrall(H))
+		to_chat(H, "<span class='warning'>You aren't powerful enough to do this.</span>")
+	else if(is_shadow(H))
+		to_chat(H, "<span class='warning'>Your telepathic ability is suppressed. Hatch or use Rapid Re-Hatch first.</span>")
 	return 0