diff --git a/VpSharp.Commands/CommandsExtension.cs b/VpSharp.Commands/CommandsExtension.cs
index 3009cee..ebe8fee 100644
--- a/VpSharp.Commands/CommandsExtension.cs
+++ b/VpSharp.Commands/CommandsExtension.cs
@@ -134,6 +134,7 @@ public sealed class CommandsExtension : VirtualParadiseClientExtension
     /// <inheritdoc />
     protected override Task OnMessageReceived(MessageReceivedEventArgs args)
     {
+        ArgumentNullException.ThrowIfNull(args);
         var message = args.Message;
 
         if (message.Type != MessageType.ChatMessage)
diff --git a/VpSharp.Commands/VirtualParadiseClientExtensions.cs b/VpSharp.Commands/VirtualParadiseClientExtensions.cs
index d8e2e06..43e6a31 100644
--- a/VpSharp.Commands/VirtualParadiseClientExtensions.cs
+++ b/VpSharp.Commands/VirtualParadiseClientExtensions.cs
@@ -11,8 +11,10 @@ public static class VirtualParadiseClientExtensions
     /// <param name="client">The <see cref="VirtualParadiseClient" />.</param>
     /// <param name="configuration">The configuration required for the extensions.</param>
     /// <returns>The commands extension instance.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="client" /> is <see langword="null" />.</exception>
     public static CommandsExtension UseCommands(this VirtualParadiseClient client, CommandsExtensionConfiguration configuration)
     {
+        ArgumentNullException.ThrowIfNull(client);
         return client.AddExtension<CommandsExtension>(configuration);
     }
 }
diff --git a/VpSharp/src/Entities/VirtualParadiseAvatar.cs b/VpSharp/src/Entities/VirtualParadiseAvatar.cs
index 015a374..0d1461f 100644
--- a/VpSharp/src/Entities/VirtualParadiseAvatar.cs
+++ b/VpSharp/src/Entities/VirtualParadiseAvatar.cs
@@ -292,8 +292,10 @@ public sealed class VirtualParadiseAvatar : IEquatable<VirtualParadiseAvatar>
     /// </summary>
     /// <param name="world">The name of the world to which this avatar should be teleported.</param>
     /// <param name="position">The position to which this avatar should be teleported.</param>
+    /// <exception cref="ArgumentNullException"><paramref name="world" /> is <see langword="null" />.</exception>
     public Task TeleportAsync(VirtualParadiseWorld world, Vector3d position)
     {
+        ArgumentNullException.ThrowIfNull(world);
         return TeleportAsync(world.Name, position, Quaternion.Identity);
     }
 
@@ -303,8 +305,10 @@ public sealed class VirtualParadiseAvatar : IEquatable<VirtualParadiseAvatar>
     /// <param name="world">The name of the world to which this avatar should be teleported.</param>
     /// <param name="position">The position to which this avatar should be teleported.</param>
     /// <param name="rotation">The rotation to which this avatar should be teleported.</param>
+    /// <exception cref="ArgumentNullException"><paramref name="world" /> is <see langword="null" />.</exception>
     public Task TeleportAsync(VirtualParadiseWorld world, Vector3d position, Quaternion rotation)
     {
+        ArgumentNullException.ThrowIfNull(world);
         return TeleportAsync(world.Name, position, rotation);
     }
 
@@ -326,6 +330,16 @@ public sealed class VirtualParadiseAvatar : IEquatable<VirtualParadiseAvatar>
     /// <param name="rotation">The rotation to which this avatar should be teleported.</param>
     public async Task TeleportAsync(string world, Vector3d position, Quaternion rotation)
     {
+        ArgumentNullException.ThrowIfNull(world);
+#if NET7_0_OR_GREATER
+        ArgumentException.ThrowIfNullOrEmpty(world);
+#else
+        if (string.IsNullOrEmpty(world))
+        {
+            throw new ArgumentException("World cannot be empty");
+        }
+#endif
+
         // ReSharper disable InconsistentlySynchronizedField
         bool isSelf = this == _client.CurrentAvatar;
         bool isNewWorld = world != Location.World.Name;