diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 06e0a42d7..2ef5e07d7 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -286,7 +286,7 @@ void CharacterController::refreshHitRecoilAnims()
         }
         else if (recovery)
         {
-            std::string anim = isSwimming ? chooseRandomGroup("swimhit") : chooseRandomGroup("hit");
+            std::string anim = chooseRandomGroup("swimhit");
             if (isSwimming && mAnimation->hasAnimation(anim))
             {
                 mHitState = CharState_SwimHit;
diff --git a/components/misc/rng.cpp b/components/misc/rng.cpp
index dfe0eff40..e402f0b79 100644
--- a/components/misc/rng.cpp
+++ b/components/misc/rng.cpp
@@ -25,7 +25,7 @@ namespace Misc
 
     int Rng::rollDice(int max)
     {
-        return std::uniform_int_distribution<int>(0, max - 1)(generator);
+        return max > 0 ? std::uniform_int_distribution<int>(0, max - 1)(generator) : 0;
     }
 
 }