diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js
index 5e7f145e4..2bbe5ec82 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js
@@ -465,6 +465,9 @@ var GempLotrGameUI = Class.extend({
     
     processGameEnd: function() {
         var that = this;
+        if(this.allPlayerIds == null)
+            return;
+        
         $("#deck" + this.getPlayerIndex(this.bottomPlayerId)).addClass("clickable").click(
             (function (index) {
                 return function () {
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
index 7d1bcbe75..a5c98045d 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
@@ -23,7 +23,7 @@
         "order": 2,
         "sites":"FELLOWSHIP",
         "cancelRingBearerSkirmish":true,
-        "winAtEndOfRegroup":true,
+        "winAtEndOfRegroup":false,
         "discardPileIsPublic":true,
         "set":[1, 2, 3, 101],
         "erratasets": [
@@ -43,7 +43,7 @@
         "code":"pc_movie",
         "order": 4,
         "sites":"KING",
-        "winAtEndOfRegroup":true,
+        "winAtEndOfRegroup":false,
         "discardPileIsPublic":true,
         "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 101],
         "erratasets": [
@@ -64,7 +64,7 @@
         "code":"pc_expanded",
         "order": 6,
         "sites":"SHADOWS",
-        "winAtEndOfRegroup":true,
+        "winAtEndOfRegroup":false,
         "discardPileIsPublic":true,
         "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 100, 101],
         "erratasets": [
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
index 5e05cf338..2d0ccaa75 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
@@ -123,6 +123,9 @@ public class GameState {
             listener.endGame();
         }
 
+        if(_playerOrder == null || _playerOrder.getAllPlayers() == null)
+            return;
+
         for (String playerId : _playerOrder.getAllPlayers()) {
             for(var card : getDeck(playerId)) {
                 for (GameStateListener listener : getAllGameStateListeners()) {