diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java
index c267da2ce..f9d57e3ee 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java
@@ -75,7 +75,8 @@ public class DefaultLotroGame implements LotroGame {
 
             cards.put(playerId, deck);
             ringBearers.put(playerId, lotroDeck.getRingBearer());
-            rings.put(playerId, lotroDeck.getRing());
+            if (lotroDeck.getRing() != null)
+                rings.put(playerId, lotroDeck.getRing());
         }
 
         _gameState = new GameState();
@@ -100,7 +101,6 @@ public class DefaultLotroGame implements LotroGame {
     }
 
 
-
     @Override
     public boolean shouldAutoPass(String playerId, Phase phase) {
         final Set<Phase> passablePhases = _autoPassConfiguration.get(playerId);
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
index 50ca40c10..9559aa02a 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
@@ -609,7 +609,8 @@ public class HallServer extends AbstractServer {
             CardCollection ownedCollection = _collectionsManager.getPlayerCollection(player, "permanent+trophy");
 
             LotroDeck filteredSpecialCardsDeck = new LotroDeck(lotroDeck.getDeckName());
-            filteredSpecialCardsDeck.setRing(filterCard(lotroDeck.getRing(), ownedCollection));
+            if (lotroDeck.getRing() != null)
+                filteredSpecialCardsDeck.setRing(filterCard(lotroDeck.getRing(), ownedCollection));
             filteredSpecialCardsDeck.setRingBearer(filterCard(lotroDeck.getRingBearer(), ownedCollection));
 
             for (String site : lotroDeck.getSites())