diff --git a/Mage.Server/src/main/java/mage/server/game/GameFactory.java b/Mage.Server/src/main/java/mage/server/game/GameFactory.java
index a0a3621e0c0..1adcec33aba 100644
--- a/Mage.Server/src/main/java/mage/server/game/GameFactory.java
+++ b/Mage.Server/src/main/java/mage/server/game/GameFactory.java
@@ -51,7 +51,7 @@ public enum GameFactory {
     }
 
     public void addGameType(String name, MatchType matchType, Class game) {
-        if (game != null) {
+        if (matchType != null && game != null) {
             this.games.put(name, game);
             this.gameTypes.put(name, matchType);
             this.gameTypeViews.add(new GameTypeView(matchType));
diff --git a/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java b/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java
index a8150268f06..2f9e46d91c3 100644
--- a/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java
+++ b/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java
@@ -45,12 +45,10 @@ public enum PlayerFactory {
     }
 
     public void addPlayerType(String name, Class playerType) {
+        // will raise error and stop on unknown player and that's ok - it's require HumanPlayer anyway
         PlayerType type = PlayerType.getByDescription(name);
-        if (type != null) {
-            if (playerType != null) {
-                this.playerTypes.put(type, playerType);
-            }
+        if (playerType != null) {
+            this.playerTypes.put(type, playerType);
         }
     }
-
 }
diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java
index fee2de4c3fe..71e7c0a219d 100644
--- a/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java
+++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java
@@ -93,7 +93,7 @@ public enum TournamentFactory {
 
 
     public void addTournamentType(String name, TournamentType tournamentType, Class tournament) {
-        if (tournament != null) {
+        if (tournamentType != null && tournament != null) {
             this.tournaments.put(name, tournament);
             this.tournamentTypes.put(name, tournamentType);
             this.tournamentTypeViews.add(new TournamentTypeView(tournamentType));