diff --git a/gemfiles/standard.rb b/gemfiles/standard.rb
index ca63921b8f..f29b91cb4b 100644
--- a/gemfiles/standard.rb
+++ b/gemfiles/standard.rb
@@ -2,7 +2,7 @@
 
 # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockLength
 def standard_dependencies
-  gem 'yard'
+  gem 'yard', '>= 0.9.35'
   gem 'ffi'
 
   group :development, :testing do
diff --git a/upload-api-docs b/upload-api-docs
index 494516ed8e..79d1be7780 100755
--- a/upload-api-docs
+++ b/upload-api-docs
@@ -7,7 +7,7 @@ gemfile true do
   source 'https://rubygems.org'
   gem 'nokogiri'
   gem 'aws-sdk-s3'
-  gem 'yard'
+  gem 'yard', '>= 0.9.35'
 end
 
 require 'aws-sdk-s3'
@@ -113,8 +113,12 @@ def generate_docs(options)
     '--exclude', './spec',
     '--readme', './README.md',
     '-o', options[:docs_path]
-    File.delete(File.join(options[:docs_path], 'frames.html')) rescue nil
   )
+  begin
+    File.delete(File.join(options[:docs_path], 'frames.html'))
+  rescue StandardError
+    nil
+  end
 end
 
 options = Options.new