1 files changed, 2 insertions, 2 deletions
diff --git a/lib/system_check/incoming_email/imap_authentication_check.rb b/lib/system_check/incoming_email/imap_authentication_check.rb
index 056021d460c..61719abc991 100644
--- a/lib/system_check/incoming_email/imap_authentication_check.rb
+++ b/lib/system_check/incoming_email/imap_authentication_check.rb
@@ -35,7 +35,7 @@ module SystemCheck
           imap.login(mailbox[:email], mailbox[:password])
         end
         true
-      rescue => error
+      rescue StandardError => error
         @error = error
         false
       end
@@ -52,7 +52,7 @@ module SystemCheck
       def load_config
         erb = ERB.new(File.read(mail_room_config_path))
         erb.filename = mail_room_config_path
-        config_file = YAML.load(erb.result)
+        config_file = YAML.safe_load(erb.result)
 
         config_file[:mailboxes]
       end