Improved spawn logic. We shouldn't get those stupid errors any more!