diff --git a/core/src/main/python/update.py b/core/src/main/python/update.py
index 7b963f2afe..cccf6e043a 100644
--- a/core/src/main/python/update.py
+++ b/core/src/main/python/update.py
@@ -223,11 +223,14 @@ def __update_offline(model, model_context, aliases):
     # deleting servers that are added by templates before set server groups causes mayhem
     jdbc_names = topology_updater.update_machines_clusters_and_servers(delete_now=False)
 
-    # update rcu schema password must happen before updating jrf domain
+    # update rcu schema password must happen before updating a jrf domain
     if model_context.get_update_rcu_schema_pass() is True:
         rcu_helper = RCUHelper(model, model_context, aliases)
         rcu_helper.update_rcu_password()
 
+    # Unzip any database wallet files before updating a jrf domain
+    topology_updater.extract_database_wallets()
+
     __update_offline_domain()
 
     topology_updater.set_server_groups()
@@ -252,7 +255,6 @@ def __update_offline(model, model_context, aliases):
 
 
 def __update_offline_domain():
-
     try:
         __wlst_helper.update_domain()
     except BundleAwareException, ex:
@@ -272,7 +274,6 @@ def __close_domain_on_error():
         # the original problem by throwing yet another exception...
         __logger.warning('WLSDPLY-09013', ex.getLocalizedMessage(), error=ex,
                          class_name=_class_name, method_name=_method_name)
-    return
 
 
 def main(model_context):
diff --git a/core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.py b/core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.py
index 792a9c27db..cecd0d0e1c 100644
--- a/core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.py
+++ b/core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.py
@@ -86,7 +86,7 @@ def create_and_cd(location, existing_names, aliases):
     :param aliases: the alias helper used to determine path names
     """
     method_name = 'create_and_cd'
-    _logger.entering(str_helper.to_string(location), existing_names, _class_name, method_name)
+    _logger.entering(str_helper.to_string(location), existing_names, class_name=_class_name, method_name=method_name)
 
     mbean_name = get_mbean_name(location, existing_names, aliases)
     create_path = aliases.get_wlst_create_path(location)
diff --git a/core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py b/core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py
index e8867ff090..f5d8da8d13 100644
--- a/core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py
+++ b/core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py
@@ -228,6 +228,10 @@ def _set_domain_attributes(self):
     def is_online_with_ext_templates(self):
         return self.model_context.is_wlst_online() and self.model_context.get_domain_typedef().has_extension_templates()
 
+    def extract_database_wallets(self):
+        if self.archive_helper is not None:
+            self.archive_helper.extract_all_database_wallets()
+
     def _check_for_online_setservergroups_issue(self, existing_list, new_list):
         _method_name = '_check_for_online_setservergroups_issue'
         if len(existing_list) != len(new_list):
@@ -235,7 +239,6 @@ def _check_for_online_setservergroups_issue(self, existing_list, new_list):
                 if entity_name not in existing_list:
                     self.logger.warning('WLSDPLY-09701', entity_name,
                                         class_name=self._class_name, method_name=_method_name)
-        return
 
     def _create_list_of_setservergroups_targets(self):
         """