diff --git a/Fill.py b/Fill.py
index 865e394d..e4b3c7e4 100644
--- a/Fill.py
+++ b/Fill.py
@@ -110,16 +110,6 @@ def distribute_items_restrictive(world: MultiWorld, fill_locations=None):
 
     world.random.shuffle(fill_locations)
 
-    locations: dict[LocationProgressType, list[Location]] = {
-        type: [] for type in LocationProgressType}
-
-    for loc in fill_locations:
-        locations[loc.progress_type].append(loc)
-
-    prioritylocations = locations[LocationProgressType.PRIORITY]
-    defaultlocations = locations[LocationProgressType.DEFAULT]
-    excludedlocations = locations[LocationProgressType.EXCLUDED]
-
     # get items to distribute
     world.random.shuffle(world.itempool)
     progitempool = []
@@ -143,6 +133,18 @@ def distribute_items_restrictive(world: MultiWorld, fill_locations=None):
     call_all(world, "fill_hook", progitempool, nonexcludeditempool,
              localrestitempool, nonlocalrestitempool, restitempool, fill_locations)
 
+    locations: dict[LocationProgressType, list[Location]] = {
+        type: [] for type in LocationProgressType}
+
+    for loc in fill_locations:
+        locations[loc.progress_type].append(loc)
+    logging.warning("Locations: " + str(len(fill_locations)))
+    logging.warning("Items: " + str(len(world.itempool)))
+
+    prioritylocations = locations[LocationProgressType.PRIORITY]
+    defaultlocations = locations[LocationProgressType.DEFAULT]
+    excludedlocations = locations[LocationProgressType.EXCLUDED]
+
     locationDeficit = len(progitempool) - len(prioritylocations)
     if locationDeficit > 0:
         if locationDeficit > len(defaultlocations):
@@ -157,6 +159,9 @@ def distribute_items_restrictive(world: MultiWorld, fill_locations=None):
 
     if progitempool:
         fill_restrictive(world, world.state, defaultlocations, progitempool)
+        if(len(progitempool) > 0):
+            raise FillError(
+                f'Not enough locations for progress items. There are {len(progitempool)} more items than locations')
 
     if nonexcludeditempool:
         world.random.shuffle(defaultlocations)
diff --git a/test/general/TestFill.py b/test/general/TestFill.py
index 1dcba44c..64bee59c 100644
--- a/test/general/TestFill.py
+++ b/test/general/TestFill.py
@@ -487,6 +487,26 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertTrue(player3.locations[2].item.advancement)
         self.assertTrue(player3.locations[3].item.advancement)
 
+    def test_can_remove_locations_in_fill_hook(self):
+
+        multi_world = generate_multi_world()
+        player1 = generate_player_data(
+            multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
+
+        removed_item: list[Item] = []
+        removed_location: list[Location] = []
+
+        def fill_hook(progitempool, nonexcludeditempool, localrestitempool, nonlocalrestitempool, restitempool, fill_locations):
+            removed_item.append(restitempool.pop(0))
+            removed_location.append(fill_locations.pop(0))
+
+        multi_world.worlds[player1.id].fill_hook = fill_hook
+
+        distribute_items_restrictive(multi_world)
+
+        self.assertIsNone(removed_item[0].location)
+        self.assertIsNone(removed_location[0].item)
+
 
 class TestBalanceMultiworldProgression(unittest.TestCase):
     def assertRegionContains(self, region: Region, item: Item):