diff --git a/.pylintrc b/.pylintrc
index cb085b3f..ce5735a9 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -368,4 +368,4 @@ exclude-protected=_asdict,_fields,_replace,_source,_make
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtins.Exception,builtins.BaseException
diff --git a/qrexec/tools/qrexec_legacy_convert.py b/qrexec/tools/qrexec_legacy_convert.py
index 02388dd3..939904ee 100644
--- a/qrexec/tools/qrexec_legacy_convert.py
+++ b/qrexec/tools/qrexec_legacy_convert.py
@@ -288,7 +288,7 @@ def main(args=None):
                                   str(POLICYPATH), '--full-output'],
                                  output=current_state_string)
         current_state = set(current_state_string.getvalue().split('\n'))
-    except Exception: #pylint: disable-broad-except
+    except Exception: # pylint: disable=broad-except
         current_state = 'ERROR'
 
     if initial_state != current_state: