diff --git a/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java b/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java
index 2d3999c..d104252 100644
--- a/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java
+++ b/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java
@@ -16,7 +16,7 @@ public class ServerStatusMixin {
 
     @Inject(method = "getFavicon", at = @At("RETURN"), cancellable = true)
     private void injectIconEvent(CallbackInfoReturnable<String> cir) {
-        ServerStatusEvent.FaviconRequestEvent event = new ServerStatusEvent.FaviconRequestEvent(cir.getReturnValue().isEmpty() ? Optional.empty() : Optional.of(new WrappedServerStatus.WrappedFavicon(cir.getReturnValue())));
+        ServerStatusEvent.FaviconRequestEvent event = new ServerStatusEvent.FaviconRequestEvent(isEmpty(cir.getReturnValue()) ? Optional.empty() : Optional.of(new WrappedServerStatus.WrappedFavicon(cir.getReturnValue())));
         CraterEventBus.INSTANCE.postEvent(event);
 
         if (event.getNewIcon().isPresent()) {
@@ -24,4 +24,8 @@ public class ServerStatusMixin {
         }
     }
 
+    private boolean isEmpty(String input) {
+        return input == null || input.isEmpty();
+    }
+
 }
diff --git a/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java b/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java
index 2d3999c..d104252 100644
--- a/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java
+++ b/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java
@@ -16,7 +16,7 @@ public class ServerStatusMixin {
 
     @Inject(method = "getFavicon", at = @At("RETURN"), cancellable = true)
     private void injectIconEvent(CallbackInfoReturnable<String> cir) {
-        ServerStatusEvent.FaviconRequestEvent event = new ServerStatusEvent.FaviconRequestEvent(cir.getReturnValue().isEmpty() ? Optional.empty() : Optional.of(new WrappedServerStatus.WrappedFavicon(cir.getReturnValue())));
+        ServerStatusEvent.FaviconRequestEvent event = new ServerStatusEvent.FaviconRequestEvent(isEmpty(cir.getReturnValue()) ? Optional.empty() : Optional.of(new WrappedServerStatus.WrappedFavicon(cir.getReturnValue())));
         CraterEventBus.INSTANCE.postEvent(event);
 
         if (event.getNewIcon().isPresent()) {
@@ -24,4 +24,8 @@ public class ServerStatusMixin {
         }
     }
 
+    private boolean isEmpty(String input) {
+        return input == null || input.isEmpty();
+    }
+
 }
diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java.patch
index 19f9b0f..2c23abe 100644
--- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java.patch
+++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java.patch
@@ -1,6 +1,6 @@
 --- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java
 +++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java
-@@ -14,13 +14,13 @@
+@@ -14,14 +14,18 @@
  @Mixin(ServerStatus.class)
  public class ServerStatusMixin {
  
@@ -9,12 +9,17 @@
 -        ServerStatusEvent.FaviconRequestEvent event = new ServerStatusEvent.FaviconRequestEvent(cir.getReturnValue().isEmpty() ? Optional.empty() : Optional.of(new WrappedServerStatus.WrappedFavicon(cir.getReturnValue().get())));
 +    @Inject(method = "getFavicon", at = @At("RETURN"), cancellable = true)
 +    private void injectIconEvent(CallbackInfoReturnable<String> cir) {
-+        ServerStatusEvent.FaviconRequestEvent event = new ServerStatusEvent.FaviconRequestEvent(cir.getReturnValue().isEmpty() ? Optional.empty() : Optional.of(new WrappedServerStatus.WrappedFavicon(cir.getReturnValue())));
++        ServerStatusEvent.FaviconRequestEvent event = new ServerStatusEvent.FaviconRequestEvent(isEmpty(cir.getReturnValue()) ? Optional.empty() : Optional.of(new WrappedServerStatus.WrappedFavicon(cir.getReturnValue())));
          CraterEventBus.INSTANCE.postEvent(event);
  
          if (event.getNewIcon().isPresent()) {
 -            cir.setReturnValue(Optional.of(event.getNewIcon().get().toMojang()));
 +            cir.setReturnValue(event.getNewIcon().get().toMojang());
          }
++    }
++
++    private boolean isEmpty(String input) {
++        return input == null || input.isEmpty();
      }
  
+ }
diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java.patch
index 19f9b0f..2c23abe 100644
--- a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java.patch
+++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java.patch
@@ -1,6 +1,6 @@
 --- a/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java
 +++ b/Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerStatusMixin.java
-@@ -14,13 +14,13 @@
+@@ -14,14 +14,18 @@
  @Mixin(ServerStatus.class)
  public class ServerStatusMixin {
  
@@ -9,12 +9,17 @@
 -        ServerStatusEvent.FaviconRequestEvent event = new ServerStatusEvent.FaviconRequestEvent(cir.getReturnValue().isEmpty() ? Optional.empty() : Optional.of(new WrappedServerStatus.WrappedFavicon(cir.getReturnValue().get())));
 +    @Inject(method = "getFavicon", at = @At("RETURN"), cancellable = true)
 +    private void injectIconEvent(CallbackInfoReturnable<String> cir) {
-+        ServerStatusEvent.FaviconRequestEvent event = new ServerStatusEvent.FaviconRequestEvent(cir.getReturnValue().isEmpty() ? Optional.empty() : Optional.of(new WrappedServerStatus.WrappedFavicon(cir.getReturnValue())));
++        ServerStatusEvent.FaviconRequestEvent event = new ServerStatusEvent.FaviconRequestEvent(isEmpty(cir.getReturnValue()) ? Optional.empty() : Optional.of(new WrappedServerStatus.WrappedFavicon(cir.getReturnValue())));
          CraterEventBus.INSTANCE.postEvent(event);
  
          if (event.getNewIcon().isPresent()) {
 -            cir.setReturnValue(Optional.of(event.getNewIcon().get().toMojang()));
 +            cir.setReturnValue(event.getNewIcon().get().toMojang());
          }
++    }
++
++    private boolean isEmpty(String input) {
++        return input == null || input.isEmpty();
      }
  
+ }