diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
index 54495b61a..310550a88 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
@@ -34,6 +34,7 @@
 - "Bolg, Servant of Sauron" can now only be used in Maneuver phase.
 - "Burglar's Contract" can now be used in Skirmish.
 - "Crazy Cob" can now also play minions when Orcs are killed.
+- "Great Barricade" now allows to exert only companions, and doesn't crash the game, if there is a Dwarf follower present.
 
 <b>17 Dec. 2015</b>
 - "Armor of Khazad" no longer allows to return itself from discard and can now be transferred.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_004.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_004.java
index 78e9bcfd1..85daff0f3 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_004.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_004.java
@@ -41,14 +41,14 @@ public class Card31_004 extends AbstractPermanent {
     @Override
     public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) {
         return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile)
-                && PlayConditions.canExert(self, game, Race.DWARF);
+                && PlayConditions.canExert(self, game, Race.DWARF, CardType.COMPANION);
 	}
 	
 	@Override
     public PlayPermanentAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
         PlayPermanentAction permanentAction = super.getPlayCardAction(playerId, game, self, twilightModifier, ignoreRoamingPenalty);
         permanentAction.appendCost(
-                new ChooseAndExertCharactersEffect(permanentAction, playerId, 1, 1, Race.DWARF));
+                new ChooseAndExertCharactersEffect(permanentAction, playerId, 1, 1, Race.DWARF, CardType.COMPANION));
         return permanentAction;
 	}