diff --git a/app/controllers/universal_tables_controller.rb b/app/controllers/universal_tables_controller.rb
index 52ed4fd..31f73a4 100644
--- a/app/controllers/universal_tables_controller.rb
+++ b/app/controllers/universal_tables_controller.rb
@@ -148,6 +148,7 @@ class UniversalTablesController < ApplicationController
 		rows = []
 		entry.column_entries.each do |ce|
 			ct = ce.table_column
+			next if ct.nil?
 			text = ce.get_frontend_text(ct)
 			rows << {
 				"title" => ct.title,
@@ -166,6 +167,8 @@ class UniversalTablesController < ApplicationController
 			rows = []
 			e.column_entries.each do |ce|
 				ct = ce.table_column
+				next if ct.nil?
+				next if ct.display_in_index === false
 				text = ce.get_frontend_text(ct)
 				if ct.is_link_to_show
 					text = "<a href='#{OrbitHelper.url_to_show(e.to_param)}'>#{text}</a>"