diff --git a/code/datums/martial.dm b/code/datums/martial.dm
index 146959d5ab..f594f95429 100644
--- a/code/datums/martial.dm
+++ b/code/datums/martial.dm
@@ -76,6 +76,8 @@
 	return 1
 
 /datum/martial_art/proc/teach(mob/living/carbon/human/H,make_temporary=0)
+	if(!istype(H) || !H.mind)
+		return FALSE
 	if(H.mind.martial_art)
 		if(make_temporary)
 			if(!H.mind.martial_art.allow_temp_override)
@@ -98,7 +100,7 @@
 		base = M
 
 /datum/martial_art/proc/remove(mob/living/carbon/human/H)
-	if(H.mind.martial_art != src)
+	if(!istype(H) || !H.mind || H.mind.martial_art != src)
 		return
 	on_remove(H)
 	if(base)