diff --git a/datashuttle/tui/screens/setup_ssh.py b/datashuttle/tui/screens/setup_ssh.py
index 4b64f364f..1106d5b55 100644
--- a/datashuttle/tui/screens/setup_ssh.py
+++ b/datashuttle/tui/screens/setup_ssh.py
@@ -220,7 +220,7 @@ def show_connection_successful_message(self):
         # may or may not be displayed.
         try:
             self.query_one("#setup_ssh_cancel_button").remove()
-        except BaseException:
+        except Exception:
             pass
 
         message = "Connection was set up successfully."
diff --git a/datashuttle/utils/validation.py b/datashuttle/utils/validation.py
index 66b9f1b5f..cf0ccf871 100644
--- a/datashuttle/utils/validation.py
+++ b/datashuttle/utils/validation.py
@@ -627,7 +627,7 @@ def datetime_are_iso_format(
             format_to_check = utils.get_values_from_bids_formatted_name(
                 [name], key, return_as_int=False
             )[0]
-        except:
+        except Exception:
             return []
 
         strfmt = formats[key]