lib/anyway/rails/config.rb in anyway_config-2.0.0.pre vs lib/anyway/rails/config.rb in anyway_config-2.0.0.pre2

@@ -60,11 +60,11 @@
         # Create a new hash cause credentials are mutable!
         creds_config = {}
 
         creds_config.deep_merge!(::Rails.application.credentials.public_send(name) || {})
 
-        creds_config.deep_merge!(load_from_local_credentials(name: name)) if Anyway::Settings.use_local_files
+        creds_config.deep_merge!(load_from_local_credentials(name: name) || {}) if Anyway::Settings.use_local_files
         creds_config
       end
 
       def load_from_local_credentials(name:)
         local_creds_path = ::Rails.root.join("config/credentials/local.yml.enc").to_s
@@ -74,10 +74,10 @@
         creds = ::Rails.application.encrypted(
           local_creds_path,
           key_path: ::Rails.root.join("config/credentials/local.key")
         )
 
-        creds.public_send(name) || {}
+        creds.public_send(name)
       end
 
       def default_config_path(name)
         ::Rails.root.join("config", "#{name}.yml")
       end