diff --git a/src/map/pc.c b/src/map/pc.c
index c1927d19c3..68e9d67bd0 100755
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5628,11 +5628,14 @@ short pc_checkequip(struct map_session_data *sd,int pos)
  * @max : see pc.h enum equip_index for @min to ?
  * -return true,false
  *------------------------------------------*/
-bool pc_checkequip2(struct map_session_data *sd, unsigned short nameid, int min, int max){
+bool pc_checkequip2(struct map_session_data *sd, unsigned short nameid, int min, int max)
+{
 	int i;
-	for(i=min;i<max;i++){
-		if(equip_pos[i]){
+
+	for(i = min; i < max; i++) {
+		if(equip_pos[i]) {
 			int idx = sd->equip_index[i];
+
 			if (sd->status.inventory[idx].nameid == nameid)
 				return true;
 		}
diff --git a/src/map/skill.c b/src/map/skill.c
index daf37224e3..81a7dcbd08 100755
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -15188,8 +15188,8 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
 					clif_skill_fail(sd,skill_id,USESKILL_FAIL_THIS_WEAPON,0);
 					return false;
 				}
-				continue;
-			}
+			} else
+				break; // Wearing an applicable item.
 		}
 	}