diff --git a/oidc_provider/settings.py b/oidc_provider/settings.py
index 25675bb..f358826 100644
--- a/oidc_provider/settings.py
+++ b/oidc_provider/settings.py
@@ -175,13 +175,12 @@ def get(name, import_str=False):
     except AttributeError:
         if name in default_settings.required_attrs:
             raise Exception('You must set ' + name + ' in your settings.')
-    finally:
-        if isinstance(default_value, dict) and value:
-            default_value.update(value)
-            value = default_value
 
+    if isinstance(default_value, dict) and value:
+        default_value.update(value)
+        value = default_value
+    else:
         value = value or default_value
-
-    value = import_from_str(value) if import_str else value
+        value = import_from_str(value) if import_str else value
 
     return value