diff --git a/Mage.Sets/src/mage/cards/g/GollumObsessedStalker.java b/Mage.Sets/src/mage/cards/g/GollumObsessedStalker.java
index e2c0a84b7c2..b6cdbf3809e 100644
--- a/Mage.Sets/src/mage/cards/g/GollumObsessedStalker.java
+++ b/Mage.Sets/src/mage/cards/g/GollumObsessedStalker.java
@@ -88,7 +88,7 @@ class GollumObsessedStalkerWatcher extends Watcher {
             return;
         }
 
-        playersPerName.computeIfAbsent(name, k -> new HashSet());
+        playersPerName.computeIfAbsent(name, k -> new HashSet<>());
         playersPerName.get(name).add(playerId);
     }
 
@@ -171,7 +171,7 @@ enum GollumObsessedStalkerHint implements Hint {
                 name = gollumObj.getName();
             }
         }
-        if (name.isEmpty()) {
+        if (name == null || name.isEmpty()) {
             return "";
         }
 
@@ -194,4 +194,4 @@ enum GollumObsessedStalkerHint implements Hint {
     public GollumObsessedStalkerHint copy() {
         return instance;
     }
-}
\ No newline at end of file
+}