diff --git a/toontown/catalog/CatalogItem.py b/toontown/catalog/CatalogItem.py
index a54abc36..8d9149c2 100755
--- a/toontown/catalog/CatalogItem.py
+++ b/toontown/catalog/CatalogItem.py
@@ -42,8 +42,8 @@ class CatalogItem:
         return
 
     def isAward(self):
-        result = self.specialEventId != 0
-        return result
+        #result = self.specialEventId != 0
+        return False
 
     def makeNewItem(self):
         pass
diff --git a/toontown/distributed/ToontownInternalRepository.py b/toontown/distributed/ToontownInternalRepository.py
index 49ad9269..0dba7ba3 100755
--- a/toontown/distributed/ToontownInternalRepository.py
+++ b/toontown/distributed/ToontownInternalRepository.py
@@ -11,10 +11,10 @@ class ToontownInternalRepository(AstronInternalRepository):
         AstronInternalRepository.__init__(
             self, baseChannel, serverId=serverId, dcFileNames=dcFileNames,
             dcSuffix=dcSuffix, connectMethod=connectMethod, threadedNet=threadedNet)
-	
+    
     def handleConnected(self):
         self.__messenger = ToontownNetMessengerAI(self)
-	
+    
     def sendNetEvent(self, message, sentArgs=[]):
         self.__messenger.send(message, sentArgs)
         
diff --git a/toontown/toon/DistributedToonAI.py b/toontown/toon/DistributedToonAI.py
index 017e9ed3..b59ca30a 100755
--- a/toontown/toon/DistributedToonAI.py
+++ b/toontown/toon/DistributedToonAI.py
@@ -175,6 +175,7 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
         from toontown.toon.DistributedNPCToonBaseAI import DistributedNPCToonBaseAI
         if not isinstance(self, DistributedNPCToonBaseAI):
             self.sendUpdate('setDefaultShard', [self.air.districtId])
+        
         self.accept('CATALOG_addGift_UD2Toon_%d' % self.doId, self.__handleAddGift)
 
     def setLocation(self, parentId, zoneId):
@@ -237,11 +238,11 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
             PetLookerAI.PetLookerAI.destroy(self)
         del self.kart
         self._sendExitServerEvent()
+        
+        self.ignore('CATALOG_addGift_UD2Toon_%d' % self.doId)
 
         DistributedSmoothNodeAI.DistributedSmoothNodeAI.delete(self)
         DistributedPlayerAI.DistributedPlayerAI.delete(self)
-        
-        self.ignore('CATALOG_addGift_UD2Toon_%d' % self.doId)
 
     def deleteDummy(self):
         if self.inventory:
@@ -2182,7 +2183,7 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
         self.b_setCatalogNotify(self.catalogNotify, ToontownGlobals.NewItems)
         return Task.done
     
-    def __handleAddGift(self, blob):
+    def __handleAddGift(self, blob, ctx):
         store = CatalogItem.Customization | CatalogItem.DeliveryDate | CatalogItem.GiftTag
         self.onGiftOrder.append(CatalogItem.getItem(blob, store=store))
         self.b_setBothSchedules(self.onOrder, self.onGiftOrder)