diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java index c5ddb55d683..06d10d45800 100644 --- a/megamek/src/megamek/common/Entity.java +++ b/megamek/src/megamek/common/Entity.java @@ -7716,7 +7716,7 @@ public PilotingRollData checkSkid(EntityMovementType moveType, Hex prevHex, addPilotingModifierForTerrain(roll, lastPos); } - boolean prevStepPavement = (prevStep != null) ? prevStep.isPavementStep() : prevHex.hasPavement(); + boolean prevStepPavement = (prevStep != null) ? prevStep.isPavementStep() : ((prevHex != null) && prevHex.hasPavement()); PlanetaryConditions conditions = game.getPlanetaryConditions(); boolean affectedByIce = !movementMode.isHoverOrWiGE() || conditions.getWind().isStrongerThan(Wind.STRONG_GALE); boolean runOrSprint = (overallMoveType == EntityMovementType.MOVE_RUN) || (overallMoveType == EntityMovementType.MOVE_SPRINT);