diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 3113534d..9e5a4147 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -563,8 +563,8 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
 
             case SV_WEAPCHANGE:
             {
-                if(!d) return;
-                d->selectweapon(getint(p));
+                int gun = getint(p);
+                if(d) d->selectweapon(gun);
                 break;
             }