diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp
index d81be82e94..fce90870e8 100644
--- a/src/openrct2-ui/windows/Guest.cpp
+++ b/src/openrct2-ui/windows/Guest.cpp
@@ -512,6 +512,10 @@ static Guest* GetGuest(rct_window* w)
  */
 rct_window* window_guest_open(Peep* peep)
 {
+    if (peep == nullptr)
+    {
+        return nullptr;
+    }
     if (peep->AssignedPeepType == PeepType::Staff)
     {
         return window_staff_open(peep);
diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 99240d031a..051b61ee5b 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -1627,7 +1627,7 @@ rct_window* window_ride_open_vehicle(Vehicle* vehicle)
             for (int32_t i = 0; i < 32 && numPeepsLeft > 0; i++)
             {
                 Peep* peep = GetEntity<Peep>(vehicle->peep[i]);
-                if (peep != nullptr)
+                if (peep == nullptr)
                     continue;
 
                 numPeepsLeft--;