diff --git a/mods/ctf/ctf_map/maps_catalog.lua b/mods/ctf/ctf_map/maps_catalog.lua
index 586e68c..30b07d5 100644
--- a/mods/ctf/ctf_map/maps_catalog.lua
+++ b/mods/ctf/ctf_map/maps_catalog.lua
@@ -7,6 +7,11 @@ local function show_catalog(name)
 	local idx = indices[name]
 	local map = ctf_map.available_maps[idx]
 
+	if not map then
+		minetest.chat_send_player(name, "No such map found.")
+		return
+	end
+
 	local fs = "size[10,9]"
 
 	fs = fs .. "container[0,0]"
@@ -127,6 +132,11 @@ local function send_irc_catalog(name)
 	-- Select map to be displayed
 	local map = ctf_map.available_maps[indices[name]]
 
+	if not map then
+		minetest.chat_send_player(name, "No such map found.")
+		return
+	end
+
 	-- IRC color codes
 	local red = string.char(3) .. "4"
 	local normal = string.char(3)