diff --git a/toontown/golf/GolfManagerAI.py b/toontown/golf/GolfManagerAI.py
index b58fec3..f0c6632 100644
--- a/toontown/golf/GolfManagerAI.py
+++ b/toontown/golf/GolfManagerAI.py
@@ -33,7 +33,6 @@ class __GolfManagerAI(DirectObject.DirectObject):
         newCourse = DistributedGolfCourseAI.DistributedGolfCourseAI(golfZone, avIds, courseId, preferredHoleId)
         newCourse.generateWithRequired(golfZone)
         self.courseList.append(newCourse)
-        newCourse.addExpectedGolfers(avIds)
         golfZone = newCourse.getZoneId()
         self.notify.debug('%s' % self)
         self.notify.debug('returning %d' % golfZone)
diff --git a/toontown/safezone/DistributedGolfKartAI.py b/toontown/safezone/DistributedGolfKartAI.py
index 61225e9..1035a06 100644
--- a/toontown/safezone/DistributedGolfKartAI.py
+++ b/toontown/safezone/DistributedGolfKartAI.py
@@ -146,7 +146,7 @@ class DistributedGolfKartAI(DistributedObjectAI.DistributedObjectAI):
 
     def clearFullNow(self, seatIndex):
         avId = self.seats[seatIndex]
-        if avId == 0:
+        if not avId:
             self.notify.warning('Clearing an empty seat index: ' + str(seatIndex) + ' ... Strange...')
         else:
             self.seats[seatIndex] = None
@@ -291,8 +291,9 @@ class DistributedGolfKartAI(DistributedObjectAI.DistributedObjectAI):
         if numPlayers > 0:
             for seatIndex in range(len(self.seats)):
                 avId = self.seats[seatIndex]
-                avIdList.append(avId)
-                self.clearFullNow(seatIndex)
+                if avId:
+                    avIdList.append(avId)
+                    self.clearFullNow(seatIndex)
 
             golfZone = GolfManagerAI.GolfManagerAI().readyGolfCourse(avIdList, self.golfCourse)
             for avId in avIdList: