Hopefully fixes that runtime where drones could wind up in nullspace.

Should fix half of #5553