diff --git a/src/DETHRACE/common/netgame.c b/src/DETHRACE/common/netgame.c
index 4f88cdf6..6d361fcb 100644
--- a/src/DETHRACE/common/netgame.c
+++ b/src/DETHRACE/common/netgame.c
@@ -364,15 +364,17 @@ void SendAllNonCarPositions(void) {
 
     list = gProgram_state.track_spec.non_car_list;
     for (i = 0; i < gProgram_state.track_spec.ampersand_digits; ++i) {
-        if (list[i]->type_data != NULL) {
-            non_car = (tNon_car_spec*)list[i]->type_data;
-            if (non_car->collision_info.driver == eDriver_non_car_unused_slot || non_car->collision_info.car_ID != i) {
-                contents = NetGetBroadcastContents(NETMSGID_NONCARPOSITION, 0);
-                BrMatrix34Copy(&contents->data.non_car_position.mat, &list[i]->t.t.mat);
-                contents->data.non_car_position.ID = i;
-                contents->data.non_car_position.flags = list[i]->identifier[3] == '!';
-            }
+        if (list[i]->type_data == NULL) {
+            continue;
         }
+        non_car = (tNon_car_spec*)list[i]->type_data;
+        if (non_car->collision_info.driver != eDriver_non_car_unused_slot && non_car->collision_info.car_ID == i) {
+            continue;
+        }
+        contents = NetGetBroadcastContents(NETMSGID_NONCARPOSITION, 0);
+        BrMatrix34Copy(&contents->data.non_car_position.mat, &list[i]->t.t.mat);
+        contents->data.non_car_position.ID = i;
+        contents->data.non_car_position.flags = list[i]->identifier[3] == '!';
     }
     NetSendMessageStacks();
 }