diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 0dbf4c15..d2fa0d65 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -1009,12 +1009,8 @@ def initialize(consoleLogging=True):
                 curTorrentProvider.username = check_setting_str(CFG, curTorrentProvider.getID().upper(),
                                                                 curTorrentProvider.getID() + '_username', '')
             if hasattr(curTorrentProvider, 'password'):
-                try:
-                    curTorrentProvider.password = check_setting_str(CFG, curTorrentProvider.getID().upper(),
-                                                                    curTorrentProvider.getID() + '_password', '')
-                except:
-                    curTorrentProvider.password = ''
-
+                curTorrentProvider.password = check_setting_str(CFG, curTorrentProvider.getID().upper(),
+                                                                curTorrentProvider.getID() + '_password', '')
             if hasattr(curTorrentProvider, 'proxy'):
                 curTorrentProvider.proxy.enabled = bool(check_setting_int(CFG, curTorrentProvider.getID().upper(),
                                                                           curTorrentProvider.getID() + '_proxy', 0))
diff --git a/sickbeard/config.py b/sickbeard/config.py
index 7e7ea6d6..f1e7756a 100644
--- a/sickbeard/config.py
+++ b/sickbeard/config.py
@@ -360,6 +360,7 @@ def check_setting_float(config, cfg_name, item_name, def_val):
 def check_setting_str(config, cfg_name, item_name, def_val, log=True):
     # For passwords you must include the word `password` in the item_name and add `helpers.encrypt(ITEM_NAME, ENCRYPTION_VERSION)` in save_config()
     if bool(item_name.find('password') + 1):
+        log = False
         encryption_version = sickbeard.ENCRYPTION_VERSION
     else:
         encryption_version = 0
@@ -378,8 +379,8 @@ def check_setting_str(config, cfg_name, item_name, def_val, log=True):
         logger.log(item_name + " -> " + my_val, logger.DEBUG)
     else:
         logger.log(item_name + " -> ******", logger.DEBUG)
-    return my_val
 
+    return my_val
 
 class ConfigMigrator():
     def __init__(self, config_obj):