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 e2931191c..0a4cdd62e 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
@@ -219,8 +219,8 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri
     private boolean IgnoreError(Exception ex) {
         String msg = ex.getMessage();
 
-        if(msg != null && msg.contains("You don't have a deck registered yet") ||
-                msg.contains("Your selected deck is not valid for this format"))
+        if(msg != null && (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;
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js
index ece579e4d..ff06016cf 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js
@@ -860,18 +860,28 @@ var CardFilter = Class.extend({
 			sort = " sort:" + sort;
 		
 		var format = this.currentFormat;
-		if (format)
+		if (format) {
 			format = " format:" + format;
-		else
+		}
+		else {
 			format = "";
+		}
 
 		var block = $("#blockSelect option:selected").prop("value");
-		if (block)
+		if (block) {
 			block = " block:" + block;
+		}
+		else {
+			block = "":
+		}
 		
 		var set = $("#setSelect option:selected").prop("value");
-		if (set)
+		if (set) {
 			set = " set:" + set;
+		}
+		else {
+			set = "";
+		}
 
 		var cardType = $("#cardTypeSelect option:selected").prop("value");
 		if (cardType != "")
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
index 2626515b7..5cfcc6a1c 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
@@ -74,7 +74,12 @@ public class SortAndFilterCards {
             //Cache our looked-up blueprints so we're not always re-searching; also used later for sorting
             try {
                 if(!cardBPCache.containsKey(blueprintId)) {
-                    cardBPCache.putIfAbsent(blueprintId, cardLibrary.getLotroCardBlueprint(blueprintId));
+                    var bp = cardLibrary.getLotroCardBlueprint(blueprintId);
+                    //TODO: log this
+                    if(bp == null)
+                        continue;
+
+                    cardBPCache.putIfAbsent(blueprintId, bp);
                 }
             } catch (CardNotFoundException ignored) {
                 // Ignore the card