diff --git a/src/TransportManager.cpp b/src/TransportManager.cpp
index 0bbe287..35b544c 100644
--- a/src/TransportManager.cpp
+++ b/src/TransportManager.cpp
@@ -218,14 +218,14 @@ void TransportManager::stepSkywaySystem() {
 
         std::queue<WarpLocation>* queue = &it->second;
 
-        Player* plr = PlayerManager::getPlayer(it->first);
-
-        if (plr == nullptr) {
+        if (PlayerManager::players.find(it->first) == PlayerManager::players.end()) {
             // pluck out dead socket + update iterator
             it = SkywayQueues.erase(it);
             continue;
         }
 
+        Player* plr = PlayerManager::getPlayer(it->first);
+
         if (queue->empty()) {
             // send dismount packet
             INITSTRUCT(sP_FE2CL_REP_PC_RIDING_SUCC, rideSucc);