diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
index 8db511ddc..e31d2672e 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
@@ -103,7 +103,9 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri
                 responseWriter.writeXmlResponse(null);
                 return;
             } catch (HallException ex) {
-                _log.error("Error response for " + request.uri(), ex);
+                if(!IgnoreError(ex)) {
+                    _log.error("Error response for " + request.uri(), ex);
+                }
             }
             catch (Exception ex) {
                 _log.error("Additional error response for " + request.uri(), ex);
@@ -195,7 +197,7 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri
         catch (Exception ex)
         {
             //This is a worthless error that doesn't need to be spammed into the log
-            if(!ex.toString().contains("You don't have a deck registered yet")) {
+            if(!IgnoreError(ex)) {
                 _log.error("Error response for " + request.uri(), ex);
             }
             responseWriter.writeXmlResponse(marshalException(new HallException("Failed to create table. Please try again later.")));
@@ -205,6 +207,18 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri
         }
     }
 
+
+
+    private boolean IgnoreError(Exception ex) {
+        String msg = ex.getMessage();
+
+        if(msg.contains("You don't have a deck registered yet") ||
+                msg.contains("Your selected deck is not valid for this format"))
+            return true;
+
+        return false;
+    }
+
     private void dropFromTournament(HttpRequest request, String tournamentId, ResponseWriter responseWriter) throws Exception {
         HttpPostRequestDecoder postDecoder = new HttpPostRequestDecoder(request);
         try {
@@ -231,7 +245,9 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri
             _hallServer.joinQueue(queueId, resourceOwner, deckName);
             responseWriter.writeXmlResponse(null);
         } catch (HallException e) {
-            _log.error("Error response for " + request.uri(), e);
+            if(!IgnoreError(ex)) {
+                _log.error("Error response for " + request.uri(), e);
+            }
             responseWriter.writeXmlResponse(marshalException(e));
         }
         } finally {
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 6d2684395..e1212dc1c 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
@@ -641,7 +641,7 @@ public class GameState {
     }
 
     public int getCurrentSiteNumber() {
-        return _playerPosition.get(_currentPlayerId);
+        return _playerPosition.getOrDefault(_currentPlayerId, 0);
     }
 
     public void setPlayerPosition(String playerId, int i) {