diff --git a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java
index 9150f7964..94e63b5d6 100644
--- a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java
+++ b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java
@@ -39,7 +39,7 @@ public class Commandspawn extends EssentialsCommand {
             });
             respawn(user.getSource(), user, otherUser, charge, commandLabel, future);
         } else {
-            respawn(user.getSource(), null, user, charge, commandLabel, new CompletableFuture<>());
+            respawn(user.getSource(), user, user, charge, commandLabel, new CompletableFuture<>());
         }
 
         throw new NoChargeException();
diff --git a/EssentialsSpawn/src/main/java/net/essentialsx/api/v2/events/UserTeleportSpawnEvent.java b/EssentialsSpawn/src/main/java/net/essentialsx/api/v2/events/UserTeleportSpawnEvent.java
index 9505b40e3..24d78c8f6 100644
--- a/EssentialsSpawn/src/main/java/net/essentialsx/api/v2/events/UserTeleportSpawnEvent.java
+++ b/EssentialsSpawn/src/main/java/net/essentialsx/api/v2/events/UserTeleportSpawnEvent.java
@@ -33,7 +33,7 @@ public class UserTeleportSpawnEvent extends Event implements Cancellable {
     }
 
     /**
-     * @return The user who caused teleport to spawn or null if there is none
+     * @return The user who caused teleport to spawn or null if the teleport was caused by the console.
      */
     public IUser getController() {
         return controller;