diff --git a/app/models/query.rb b/app/models/query.rb
index 2d9ab30..5df7892 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -902,7 +902,7 @@ class Query < ActiveRecord::Base
       end
       order_options.scan(/cf_\d+/).uniq.each do |name|
         column = available_columns.detect {|c| c.name.to_s == name}
-        join = column.custom_field.join_for_order_statement
+        join = column && column.custom_field.join_for_order_statement
         if join
           joins << join
         end