diff --git a/frappe/core/doctype/session_default_settings/session_default_settings.py b/frappe/core/doctype/session_default_settings/session_default_settings.py
index 5af15ac3a2..752233b8bc 100644
--- a/frappe/core/doctype/session_default_settings/session_default_settings.py
+++ b/frappe/core/doctype/session_default_settings/session_default_settings.py
@@ -31,7 +31,7 @@ def set_session_default_values(default_values):
 	for entry in default_values:
 		try:
 			frappe.defaults.set_user_default(entry, default_values.get(entry))
-		except:
+		except Exception:
 			return
 	return "success"
 
diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js
index f5a09303c5..9e6ccfe48b 100644
--- a/frappe/public/js/frappe/ui/toolbar/toolbar.js
+++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js
@@ -252,7 +252,7 @@ frappe.ui.toolbar.setup_session_defaults = function() {
 					'click': () => {
 						frappe.set_route('Form', 'Session Default Settings', 'Session Default Settings');
 					}
-				}
+				};
 			}
 			frappe.prompt(fields, function(values) {
 				frappe.call({
@@ -266,15 +266,14 @@ frappe.ui.toolbar.setup_session_defaults = function() {
 								'message': __('Session Defaults Saved'),
 								'indicator': 'green'
 							});
-						}
-						else {
+						}	else {
 							frappe.show_alert({
 								'message': __('An error occurred while setting Session Defaults'),
 								'indicator': 'red'
 							});
 						}
 					}
-				})
+				});
 			},
 			__('Session Defaults'),
 			__('Save'),