diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index bb421b26bdf..96857b2a2c9 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -5709,7 +5709,7 @@ ACMD(useskill)
 	pc->autocast_clear(sd);
 
 	if (skill_id >= HM_SKILLBASE && skill_id < HM_SKILLBASE+MAX_HOMUNSKILL
-		&& sd->hd && homun_alive(sd->hd)) // (If used with @useskill, put the homunc as dest)
+		&& homun_alive(sd->hd)) // (If used with @useskill, put the homunc as dest)
 		bl = &sd->hd->bl;
 	else
 		bl = &sd->bl;
@@ -7306,7 +7306,7 @@ ACMD(makehomun)
 
 	homunid = atoi(message);
 
-	if (homunid == -1 && sd->status.hom_id && !(sd->hd && homun_alive(sd->hd))) {
+	if (homunid == -1 && sd->status.hom_id && !(homun_alive(sd->hd))) {
 		if (!sd->hd)
 			homun->call(sd);
 		else if( sd->hd->homunculus.vaporize )
diff --git a/src/map/chrif.c b/src/map/chrif.c
index fecaffeaf0b..b6902f36625 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -328,7 +328,7 @@ static bool chrif_save(struct map_session_data *sd, int flag)
 
 	if( sd->status.pet_id > 0 && sd->pd )
 		intif->save_petdata(sd->status.account_id,&sd->pd->pet);
-	if( sd->hd && homun_alive(sd->hd) )
+	if (homun_alive(sd->hd))
 		homun->save(sd->hd);
 	if( sd->md && mercenary->get_lifetime(sd->md) > 0 )
 		mercenary->save(sd->md);