diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt
index a50bd6d35..325437a1f 100644
--- a/angelsbioprocessing/changelog.txt
+++ b/angelsbioprocessing/changelog.txt
@@ -10,6 +10,7 @@ Date: xx.xx.xxxx
     - Made wood production available earlier (932)
       - Recipe changes for Tree seed generators, Arboretum, and Composter
       - Tech tree changes
+    - Added custom error message for when trying to insert invalid items into butchery, composter, or hatchery (933)
 ---------------------------------------------------------------------------------------------------
 Version: 0.7.24
 Date: 23.02.2023
diff --git a/angelsbioprocessing/locale/en/bio-processing.cfg b/angelsbioprocessing/locale/en/bio-processing.cfg
index b56f47438..037a1dc03 100644
--- a/angelsbioprocessing/locale/en/bio-processing.cfg
+++ b/angelsbioprocessing/locale/en/bio-processing.cfg
@@ -653,3 +653,8 @@ angels-bio-tile-pollution-absorbtion-multiplier=Biologically active tile polluti
 
 [mod-setting-description]
 angels-bio-tile-pollution-absorbtion-multiplier=Increases the pollution absorption to reduce the pollution cloud in your base.
+
+[cant_insert]
+angels-butchery-limitation=__1__ cannot be butchered.
+angels-composter-limitation=__1__ cannot be composted.
+angels-hatchery-limitation=__1__ cannot be incubated.
diff --git a/angelsbioprocessing/prototypes/buildings/butchery.lua b/angelsbioprocessing/prototypes/buildings/butchery.lua
index a314c9aa2..d4ddabfc8 100644
--- a/angelsbioprocessing/prototypes/buildings/butchery.lua
+++ b/angelsbioprocessing/prototypes/buildings/butchery.lua
@@ -23,6 +23,7 @@ data:extend({
     selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
     drawing_box = { { -1.5, -1.75 }, { 1.5, 1.5 } },
     crafting_categories = { "bio-butchery" },
+    cant_insert_at_source_message_key = "cant_insert.angels-butchery-limitation",
     module_specification = {
       module_slots = 2,
     },
diff --git a/angelsbioprocessing/prototypes/buildings/composter.lua b/angelsbioprocessing/prototypes/buildings/composter.lua
index 48071caa4..caec84e92 100644
--- a/angelsbioprocessing/prototypes/buildings/composter.lua
+++ b/angelsbioprocessing/prototypes/buildings/composter.lua
@@ -22,6 +22,7 @@ data:extend({
     collision_box = { { -1.4, -1.4 }, { 1.4, 1.4 } },
     selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
     crafting_categories = { "angels-bio-void" },
+    cant_insert_at_source_message_key = "cant_insert.angels-composter-limitation",
     module_specification = {
       module_slots = 2,
     },
diff --git a/angelsbioprocessing/prototypes/buildings/hatchery.lua b/angelsbioprocessing/prototypes/buildings/hatchery.lua
index 2b88b8ccc..5c79b71ad 100644
--- a/angelsbioprocessing/prototypes/buildings/hatchery.lua
+++ b/angelsbioprocessing/prototypes/buildings/hatchery.lua
@@ -23,6 +23,7 @@ data:extend({
     selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
     drawing_box = { { -1.5, -1.75 }, { 1.5, 1.5 } },
     crafting_categories = { "bio-hatchery" },
+    cant_insert_at_source_message_key = "cant_insert.angels-hatchery-limitation",
     module_specification = {
       module_slots = 2,
     },
diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt
index 5f8b507ce..0dd76e2ff 100644
--- a/angelsrefining/changelog.txt
+++ b/angelsrefining/changelog.txt
@@ -5,6 +5,7 @@ Date: xx.xx.xxxx
     - Moved Electro-refining to purple science. Replaced Crystal catalyst with Hybrid catalyst in Thorium sorting recipe (909)
     - Compatibility with Bob's changes (911)
     - Enabled productivity modules for Thorium Ore sorting recipe (929)
+    - Added custom error message for when trying to insert invalid items into a barreling pump (933)
 ---------------------------------------------------------------------------------------------------
 Version: 0.12.4
 Date: 23.02.2023
diff --git a/angelsrefining/locale/en/water-treatment.cfg b/angelsrefining/locale/en/water-treatment.cfg
index fa4baf2b5..4652cd9e4 100644
--- a/angelsrefining/locale/en/water-treatment.cfg
+++ b/angelsrefining/locale/en/water-treatment.cfg
@@ -92,3 +92,5 @@ water-treatment=Essential methods for the treatment of impure water.
 angels-fluid-barreling=Methods to fill fluids into containers for alternative transport.
 water-washing=Processing of mud water and extraction of sediments.
 
+[cant_insert]
+angels-barreling-pump-limitation=__1__ cannot be filled.
diff --git a/angelsrefining/prototypes/buildings/barreling-pump.lua b/angelsrefining/prototypes/buildings/barreling-pump.lua
index 340c6d4a7..c85878da0 100644
--- a/angelsrefining/prototypes/buildings/barreling-pump.lua
+++ b/angelsrefining/prototypes/buildings/barreling-pump.lua
@@ -117,6 +117,7 @@ if angelsmods.trigger.enable_auto_barreling then
   barreling_pump.result_inventory_size = 1
   barreling_pump.source_inventory_size = 1
   barreling_pump.ingredient_count = nil
+  barreling_pump.cant_insert_at_source_message_key = "cant_insert.angels-barreling-pump-limitation",
 end
 
 data:extend({ barreling_pump })