diff --git a/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java b/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java
index 7a06d6741a9..4da53b93e33 100644
--- a/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java
+++ b/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java
@@ -71,7 +71,7 @@ public enum UserStatsRepository {
             QueryBuilder<UserStats, Object> qb = dao.queryBuilder();
             qb.limit(1L).where().eq("userName", userName);
             List<UserStats> users = dao.query(qb.prepare());
-            if (users.size() == 1) {
+            if (!users.isEmpty()) {
                 return users.get(0);
             }
         } catch (SQLException ex) {
@@ -95,7 +95,7 @@ public enum UserStatsRepository {
           QueryBuilder<UserStats, Object> qb = dao.queryBuilder();
             qb.orderBy("endTimeMs", false).limit(1L);
           List<UserStats> users = dao.query(qb.prepare());
-          if (users.size() == 1) {
+            if (!users.isEmpty()) {
               return users.get(0).getEndTimeMs();
           }
         } catch (SQLException ex) {
diff --git a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java
index b2ff360a115..a6a94d618ed 100644
--- a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java
+++ b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java
@@ -115,7 +115,7 @@ public enum ExpansionRepository {
             QueryBuilder<ExpansionInfo, Object> qb = expansionDao.queryBuilder();
             qb.limit(1L).where().eq("code", new SelectArg(setCode));
             List<ExpansionInfo> expansions = expansionDao.query(qb.prepare());
-            if (expansions.size() > 0) {
+            if (!expansions.isEmpty()) {
                 set = expansions.get(0);
             }
         } catch (SQLException ex) {
@@ -129,7 +129,7 @@ public enum ExpansionRepository {
             QueryBuilder<ExpansionInfo, Object> qb = expansionDao.queryBuilder();
             qb.limit(1L).where().eq("name", new SelectArg(setName));
             List<ExpansionInfo> expansions = expansionDao.query(qb.prepare());
-            if (expansions.size() > 0) {
+            if (!expansions.isEmpty()) {
                 set = expansions.get(0);
             }
         } catch (SQLException ex) {