diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index cc36be390d..6ede76af68 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -21399,7 +21399,7 @@ void Player::ResetMap()
     GetMapRef().unlink();
 }
 
-void SetMap(Map * map)
+void Player::SetMap(Map * map)
 {
     Unit::SetMap(map);
     m_mapRef.link(map, this);
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 2e3ce92d00..58237a092d 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -2868,6 +2868,8 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
     if (canBlock)
     {
         int32 blockChance = int32(pVictim->GetUnitBlockChance()*100.0f)  - skillDiff * 4;
+        if ( blockChance < 0 )
+            blockChance = 0;
         tmp += blockChance;
 
         if (roll < tmp)