diff --git a/src/ipahealthcheck/ipa/certs.py b/src/ipahealthcheck/ipa/certs.py
index 11ac0c1a..4ea5112a 100644
--- a/src/ipahealthcheck/ipa/certs.py
+++ b/src/ipahealthcheck/ipa/certs.py
@@ -343,7 +343,6 @@ def check(self):
 
                 try:
                     if 'pwd_file' in signature(certdb.NSSDatabase).parameters:
-                        # pylint: disable=unexpected-keyword-arg
                         db = certdb.NSSDatabase(
                             dbdir, token=token,
                             pwd_file=pwd_file.name if pwd_file else None)
@@ -624,7 +623,6 @@ def check(self):
             pwd_file = get_token_password_file(self.ca.hsm_enabled,
                                                token)
 
-            # pylint: disable=unexpected-keyword-arg
             db = certdb.NSSDatabase(
                 paths.PKI_TOMCAT_ALIAS_DIR, token=token,
                 pwd_file=pwd_file.name if pwd_file else None)
@@ -987,7 +985,7 @@ def check(self):
                         key=key,
                         dbdir=dbdir,
                         nickname=nickname,
-                        reason=response.output_error,
+                        reason=str(e),
                         msg='Validation of {nickname} in {dbdir} failed: '
                             '{reason}')
                 else:
@@ -1251,7 +1249,6 @@ def check(self):
                 dbdir = request.get('cert-database')
                 try:
                     if 'pwd_file' in signature(certdb.NSSDatabase).parameters:
-                        # pylint: disable=unexpected-keyword-arg
                         db = certdb.NSSDatabase(
                             dbdir, token=token,
                             pwd_file=pwd_file.name if pwd_file else None
diff --git a/src/ipahealthcheck/ipa/trust.py b/src/ipahealthcheck/ipa/trust.py
index b9628079..243502f3 100644
--- a/src/ipahealthcheck/ipa/trust.py
+++ b/src/ipahealthcheck/ipa/trust.py
@@ -307,7 +307,7 @@ def check(self):
                 id = pysss_nss_idmap.getnamebysid(sid + '-500')
             except Exception as e:
                 yield Result(self, constants.ERROR,
-                             key=id,
+                             key='getnamebysid',
                              domain=domain,
                              error=str(e),
                              msg='Look up of ID {key} for {domain} failed: '