diff --git a/Mage.Server/src/main/java/mage/server/MageServerImpl.java b/Mage.Server/src/main/java/mage/server/MageServerImpl.java
index 227a9dc1a03..6216facb1a0 100644
--- a/Mage.Server/src/main/java/mage/server/MageServerImpl.java
+++ b/Mage.Server/src/main/java/mage/server/MageServerImpl.java
@@ -172,9 +172,7 @@ public class MageServerImpl implements MageServer {
                     logger.debug("Tournament table " + table.getTableId() + " created");
                     LogServiceImpl.instance.log(LogKeys.KEY_TOURNAMENT_TABLE_CREATED, sessionId, userId.toString(), table.getTableId().toString());
                     return table;
-                } catch (NumberFormatException ex) {
-                    handleException(ex);
-                } catch (MageException ex) {
+                } catch (Exception ex) {
                     handleException(ex);
                 }
                 return null;
diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java
index e32d494d17c..d99dd991938 100644
--- a/Mage.Server/src/main/java/mage/server/Main.java
+++ b/Mage.Server/src/main/java/mage/server/Main.java
@@ -284,11 +284,7 @@ public class Main {
             return (MatchType) Class.forName(plugin.getTypeName(), true, classLoader).newInstance();
         } catch (ClassNotFoundException ex) {
             logger.warn("Game type not found:" + plugin.getJar() + " - check plugin folder", ex);
-        } catch (IllegalAccessException ex) {
-            logger.fatal("Error loading game type " + plugin.getJar(), ex);
-        } catch (InstantiationException ex) {
-            logger.fatal("Error loading game type " + plugin.getJar(), ex);
-        } catch (MalformedURLException ex) {
+        } catch (Exception ex) {
             logger.fatal("Error loading game type " + plugin.getJar(), ex);
         }
         return null;
@@ -301,11 +297,7 @@ public class Main {
             return (TournamentType) Class.forName(plugin.getTypeName(), true, classLoader).newInstance();
         } catch (ClassNotFoundException ex) {
             logger.warn("Tournament type not found:" + plugin.getName() + " / "+ plugin.getJar() + " - check plugin folder", ex);
-        } catch (IllegalAccessException ex) {
-            logger.fatal("Error loading game type " + plugin.getJar(), ex);
-        } catch (InstantiationException ex) {
-            logger.fatal("Error loading game type " + plugin.getJar(), ex);
-        } catch (MalformedURLException ex) {
+        } catch (Exception ex) {
             logger.fatal("Error loading game type " + plugin.getJar(), ex);
         }
         return null;