diff --git a/lib/capybara/helpers.rb b/lib/capybara/helpers.rb
index b8179c80..99a811c7 100644
--- a/lib/capybara/helpers.rb
+++ b/lib/capybara/helpers.rb
@@ -49,8 +49,9 @@ module Capybara
     #
     def inject_asset_host(html, host: Capybara.asset_host)
       if host && Nokogiri::HTML(html).css('base').empty?
-        match = html.match(/<head[^<]*?>/)
-        return html.clone.insert match.end(0), "<base href='#{host}' />" if match
+        html.match(/<head[^<]*?>/) do |m|
+          return html.clone.insert m.end(0), "<base href='#{host}' />"
+        end
       end
       html
     end
diff --git a/lib/capybara/queries/current_path_query.rb b/lib/capybara/queries/current_path_query.rb
index f30c6b5a..02d4ca71 100644
--- a/lib/capybara/queries/current_path_query.rb
+++ b/lib/capybara/queries/current_path_query.rb
@@ -18,8 +18,8 @@ module Capybara
 
       def resolves_for?(session)
         uri = ::Addressable::URI.parse(session.current_url)
-        uri.query = nil if uri && options[:ignore_query]
-        @actual_path = options[:url] ? uri.to_s : uri&.request_uri
+        uri&.query = nil if options[:ignore_query]
+        @actual_path = options[:url] ? uri&.to_s : uri&.request_uri
 
         if @expected_path.is_a? Regexp
           @actual_path.to_s.match(@expected_path)