diff --git a/vMenu/CommonFunctions.cs b/vMenu/CommonFunctions.cs
index 4f3f917c..7e02156f 100644
--- a/vMenu/CommonFunctions.cs
+++ b/vMenu/CommonFunctions.cs
@@ -313,6 +313,10 @@ public async void TeleportToWp()
                 pos.Z = 150f;
                 await TeleportToCoords(pos);
             }
+            else
+            {
+                Notify.Error("You need to set a waypoint first!");
+            }
         }
         #endregion
 
diff --git a/vMenu/menus/WeaponOptions.cs b/vMenu/menus/WeaponOptions.cs
index f007379e..8fb0d13c 100644
--- a/vMenu/menus/WeaponOptions.cs
+++ b/vMenu/menus/WeaponOptions.cs
@@ -795,10 +795,12 @@ private void CreateMenu()
                 if (item == noReload)
                 {
                     NoReload = _checked;
+                    Subtitle.Custom($"No reload is now {(_checked ? "enabled" : "disabled")}.");
                 }
                 else if (item == unlimitedAmmo)
                 {
                     UnlimitedAmmo = _checked;
+                    Subtitle.Custom($"Unlimited ammo is now {(_checked ? "enabled" : "disabled")}.");
                 }
             };
             #endregion