diff --git a/Mage.Client/src/main/java/mage/client/remote/S3Uploader.java b/Mage.Client/src/main/java/mage/client/remote/S3Uploader.java
index 95be10c267..85968f6ea0 100644
--- a/Mage.Client/src/main/java/mage/client/remote/S3Uploader.java
+++ b/Mage.Client/src/main/java/mage/client/remote/S3Uploader.java
@@ -21,7 +21,7 @@ public class S3Uploader {
 
         if (accessKeyId == null || accessKeyId.isEmpty()
                 || secretKeyId == null || secretKeyId.isEmpty()
-                || existingBucketName == null || existingBucketName.isEmpty()) {
+                || existingBucketName.isEmpty()) {
             logger.info("Aborting json log sync.");
             return false;
         }
diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java
index d2f69ef5ac..868fd5f4ee 100644
--- a/Mage.Server/src/main/java/mage/server/TableController.java
+++ b/Mage.Server/src/main/java/mage/server/TableController.java
@@ -975,7 +975,7 @@ public class TableController {
             if (!(table.getState() == TableState.WAITING || table.getState() == TableState.STARTING || table.getState() == TableState.READY_TO_START)) {
                 if (match == null) {
                     logger.warn("- Match table with no match:");
-                    logger.warn("-- matchId:" + match.getId() + " , table : " + table.getId());
+                    logger.warn("-- match: null , table : " + table.getId());
                     // return false;
                 } else if (match.isDoneSideboarding() && match.getGame() == null) {
                     // no sideboarding and not active game -> match seems to hang (maybe the Draw bug)
diff --git a/Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheekiSublimeArtificerTest.java b/Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheeliSublimeArtificerTest.java
similarity index 92%
rename from Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheekiSublimeArtificerTest.java
rename to Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheeliSublimeArtificerTest.java
index da1dae2834..38d1577020 100644
--- a/Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheekiSublimeArtificerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheeliSublimeArtificerTest.java
@@ -15,7 +15,7 @@ import org.mage.test.serverside.base.CardTestOathbreaker3PlayersFFA;
  * @author LevelX2
  */
 
-public class BasicSaheekiSublimeArtificerTest extends CardTestOathbreaker3PlayersFFA {
+public class BasicSaheeliSublimeArtificerTest extends CardTestOathbreaker3PlayersFFA {
 
     /**
      * Check that if a player left the game, it's commander is also removed
@@ -35,7 +35,7 @@ public class BasicSaheekiSublimeArtificerTest extends CardTestOathbreaker3Player
         assertCommandZoneCount(playerA, "Thoughtcast", 0);
 
     }
-    
+
     @Test
     public void castCommanderTest() {
 
@@ -44,18 +44,18 @@ public class BasicSaheekiSublimeArtificerTest extends CardTestOathbreaker3Player
 
         // Planeswalker 5 Loyality Counter
         // Whenever you cast a noncreature spell, create a 1/1 colorless Servo artifact creature token.
-        // -2: Target artifact you control becomes a copy of another target artifact or creature you control until end of turn, 
-        // except it's an artifact in addition to its other types.        
+        // -2: Target artifact you control becomes a copy of another target artifact or creature you control until end of turn,
+        // except it's an artifact in addition to its other types.
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Saheeli, Sublime Artificer"); // Planeswalker 5  {1}{U/R}{U/R}
 
         // Affinity for artifacts
-        // Draw two cards.        
+        // Draw two cards.
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Thoughtcast"); // Sorcery {4}{U}
-        
+
         setStopAt(1, PhaseStep.DECLARE_ATTACKERS);
         execute();
 
-        
+
         assertCommandZoneCount(playerB, "Saheeli, Sublime Artificer", 1);
         assertCommandZoneCount(playerB, "Thoughtcast", 1);
         assertCommandZoneCount(playerC, "Saheeli, Sublime Artificer", 1);
@@ -66,4 +66,4 @@ public class BasicSaheekiSublimeArtificerTest extends CardTestOathbreaker3Player
         assertCommandZoneCount(playerA, "Thoughtcast", 1);
 
     }
-}
\ No newline at end of file
+}