diff --git a/cybersyn/scripts/gui/inventory.lua b/cybersyn/scripts/gui/inventory.lua
index b1262be..86833b7 100644
--- a/cybersyn/scripts/gui/inventory.lua
+++ b/cybersyn/scripts/gui/inventory.lua
@@ -102,8 +102,9 @@ function inventory_tab.build(map_data, player_data)
 						goto has_match
 					end
 				end
-			else
-				local comb1_signals, _ = get_signals(station)
+			end
+			local comb1_signals, _ = get_signals(station)
+			if comb1_signals then
 				for _, signal_ID in pairs(comb1_signals) do
 					local item = signal_ID.signal.name
 					if item then
diff --git a/cybersyn/scripts/gui/stations.lua b/cybersyn/scripts/gui/stations.lua
index 33a7c5f..cf29242 100644
--- a/cybersyn/scripts/gui/stations.lua
+++ b/cybersyn/scripts/gui/stations.lua
@@ -123,15 +123,15 @@ function stations_tab.build(map_data, player_data, query_limit)
 
 
 		if search_item then
-
 			if station.deliveries then
 				for item_name, _ in pairs(station.deliveries) do
 					if item_name == search_item then
 						goto has_match
 					end
 				end
-			else
-				local comb1_signals, _ = get_signals(station)
+			end
+			local comb1_signals, _ = get_signals(station)
+			if comb1_signals then
 				for _, signal_ID in pairs(comb1_signals) do
 					local item = signal_ID.signal.name
 					if item then