Fix: Handle situation with null random spawns
Fix: Handle null random spawns a bit nicer