diff --git a/lib/searchkick/search.rb b/lib/searchkick/search.rb
index 8729268..e2466d4 100644
--- a/lib/searchkick/search.rb
+++ b/lib/searchkick/search.rb
@@ -327,7 +327,7 @@ module Searchkick
         status_code = e.message[0..3].to_i
         if status_code == 404
           raise "Index missing - run #{searchkick_klass.name}.reindex"
-        elsif status_code == 500 and e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]")
+        elsif status_code == 500 and (e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]") or e.message.include?("No query registered for [multi_match]"))
           raise "Upgrade Elasticsearch to 0.90.0 or greater"
         else
           raise e
--
libgit2 0.21.0