From 12b8c12d745e3e37806a5903a6154a1af42d8a34 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Tue, 22 Jan 2019 16:01:05 +0400
Subject: [PATCH] Fixed NPE

---
 .../java/mage/client/table/TablesUtil.java     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/table/TablesUtil.java b/Mage.Client/src/main/java/mage/client/table/TablesUtil.java
index bdb6bc363bc..48a0ca3bffa 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesUtil.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesUtil.java
@@ -29,14 +29,16 @@ public class TablesUtil {
     public static int findTableRowFromSearchId(Object tableModel, String searchId) {
         // tableUUID;gameUUID
         int row = -1;
-        if (tableModel instanceof TablesTableModel) {
-            row = ((TablesTableModel) tableModel).findRowByTableAndGameInfo(searchId);
-        } else if (tableModel instanceof MatchesTableModel) {
-            row = ((MatchesTableModel) tableModel).findRowByTableAndGameInfo(searchId);
-        } else if (tableModel instanceof TournamentMatchesTableModel) {
-            row = ((TournamentMatchesTableModel) tableModel).findRowByTableAndGameInfo(searchId);
-        } else {
-            logger.error("Not supported tables model " + tableModel.getClass().toString());
+        if (searchId != null) {
+            if (tableModel instanceof TablesTableModel) {
+                row = ((TablesTableModel) tableModel).findRowByTableAndGameInfo(searchId);
+            } else if (tableModel instanceof MatchesTableModel) {
+                row = ((MatchesTableModel) tableModel).findRowByTableAndGameInfo(searchId);
+            } else if (tableModel instanceof TournamentMatchesTableModel) {
+                row = ((TournamentMatchesTableModel) tableModel).findRowByTableAndGameInfo(searchId);
+            } else {
+                logger.error("Not supported tables model " + tableModel.getClass().toString());
+            }
         }
         return row;
     }