diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/CreditsCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/CreditsCommand.java
index 826d6999..0378edc4 100644
--- a/src/main/java/me/zeroeightsix/kami/command/commands/CreditsCommand.java
+++ b/src/main/java/me/zeroeightsix/kami/command/commands/CreditsCommand.java
@@ -9,7 +9,7 @@ import java.util.List;
 import static me.zeroeightsix.kami.util.MessageSendHelper.sendChatMessage;
 
 /**
- * Created by S-B99 on 01/12/2019.
+ * Created by dominikaaaa on 01/12/2019.
  * Revamped by d1gress/Qther on 13 April 2020
  */
 
@@ -23,7 +23,7 @@ public class CreditsCommand extends Command {
     @Override
     public void call(String[] args) {
         List<Integer> exceptions = Arrays.asList(
-                17222512, // s-b99 / dominika
+                17222512, // dominikaaaa / dominika
                 27009727, // zeroeightysix
                 48992448, // blockparole
                 19880089, // EmotionalLove
@@ -46,7 +46,7 @@ public class CreditsCommand extends Command {
                 "\n&l&9Author:" +
                 "\n086 (zeroeightysix)" +
                 "\n&l&9Contributors:" +
-                "\nBella (S-B99)" +
+                "\nDominika (dominikaaaa)" +
                 "\nhub (blockparole)" +
                 "\nSasha (EmotionalLove)" +
                 "\nQther (d1gress / Vonr)" +
diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/EntityStatsCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/EntityStatsCommand.java
index bf35c024..3884c8d2 100644
--- a/src/main/java/me/zeroeightsix/kami/command/commands/EntityStatsCommand.java
+++ b/src/main/java/me/zeroeightsix/kami/command/commands/EntityStatsCommand.java
@@ -7,6 +7,7 @@ import net.minecraft.entity.passive.AbstractHorse;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Objects;
 
 import static me.zeroeightsix.kami.util.MessageSendHelper.sendChatMessage;
 
@@ -27,7 +28,6 @@ public class EntityStatsCommand extends Command {
 
         if (mc.player.getRidingEntity() != null && mc.player.getRidingEntity() instanceof AbstractHorse) {
             AbstractHorse horse = (AbstractHorse) mc.player.getRidingEntity();
-            // TODO: Function that resolves UUID's to Minecraft usernames. @bella
             float maxHealth = horse.getMaxHealth();
             double speed = round(43.17 * horse.getAIMoveSpeed(), 2);
             double jump = round(-0.1817584952 * Math.pow(horse.getHorseJumpStrength(), 3) + 3.689713992 * Math.pow(horse.getHorseJumpStrength(), 2) + 2.128599134 * horse.getHorseJumpStrength() - 0.343930367, 4);
@@ -36,7 +36,7 @@ public class EntityStatsCommand extends Command {
             String builder = "&6Entity Statistics:" + "\n&cMax Health: " + maxHealth +
                       "\n&cSpeed: " + speed +
                       "\n&cJump: " + jump +
-                      "\n&cOwner: " + EntityUtil.getNameFromUUID(ownerId).replace("\"", "");
+                      "\n&cOwner: " + Objects.requireNonNull(EntityUtil.getNameFromUUID(ownerId)).replace("\"", "");
             sendChatMessage(builder);
         } else if (mc.player.getRidingEntity() instanceof EntityLivingBase) {
             EntityLivingBase entity = (EntityLivingBase) mc.player.getRidingEntity();