diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeMoreThanXWoundsModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeMoreThanXWoundsModifier.java
index 3f2de3c8f..7a35f01d7 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeMoreThanXWoundsModifier.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeMoreThanXWoundsModifier.java
@@ -22,7 +22,7 @@ public class CantTakeMoreThanXWoundsModifier extends AbstractModifier {
 
     public CantTakeMoreThanXWoundsModifier(PhysicalCard source, final Phase phase, int count, Condition condition, Filterable... affectFilters) {
         super(source, "Can't take more than " + count + " wound(s)", Filters.and(affectFilters),
-                new AndCondition(new PhaseCondition(phase), condition), ModifierEffect.WOUND_MODIFIER);
+                (condition == null ? new PhaseCondition(phase) : new AndCondition(new PhaseCondition(phase), condition)), ModifierEffect.WOUND_MODIFIER);
         _phase = phase;
         _count = count;
     }
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/conditions/AndCondition.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/conditions/AndCondition.java
index 9b38e14c3..16d2a9a6a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/conditions/AndCondition.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/conditions/AndCondition.java
@@ -14,7 +14,7 @@ public class AndCondition implements Condition {
     @Override
     public boolean isFullfilled(GameState gameState, ModifiersQuerying modifiersQuerying) {
         for (Condition condition : _conditions) {
-            if (!condition.isFullfilled(gameState, modifiersQuerying))
+            if (condition != null && !condition.isFullfilled(gameState, modifiersQuerying))
                 return false;
         }
 
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/conditions/OrCondition.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/conditions/OrCondition.java
index e3a300504..074224b74 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/conditions/OrCondition.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/conditions/OrCondition.java
@@ -14,7 +14,7 @@ public class OrCondition implements Condition {
     @Override
     public boolean isFullfilled(GameState gameState, ModifiersQuerying modifiersQuerying) {
         for (Condition condition : _conditions) {
-            if (condition.isFullfilled(gameState, modifiersQuerying))
+            if (condition != null && condition.isFullfilled(gameState, modifiersQuerying))
                 return true;
         }