diff --git a/src/security/certstore.cpp b/src/security/certstore.cpp
index 8bd9236568b3d8c69ba86ac767a9416515121d90..cea117af8965a689f8ccaf2616ef5323701a85f7 100644
--- a/src/security/certstore.cpp
+++ b/src/security/certstore.cpp
@@ -148,9 +148,7 @@ CertificateStore::getCertificate(const std::string& k)
 {
     auto getCertificate_ = [this](const std::string& k) -> std::shared_ptr<crypto::Certificate> {
         auto cit = certs_.find(k);
-        if (cit == certs_.cend())
-            return {};
-        return cit->second;
+        return cit != certs_.cend() ? cit->second : std::shared_ptr<crypto::Certificate>{};
     };
     std::unique_lock<std::mutex> l(lock_);
     auto crt = getCertificate_(k);
@@ -633,7 +631,7 @@ TrustStore::getCertificateStatus(const std::string& cert_id) const
         cert = cert->issuer? cert->issuer : certStore_.getCertificate(cert->getIssuerUID());
     }
 
-    return allowed? PermissionStatus::ALLOWED : PermissionStatus::UNDEFINED;
+    return allowed ? PermissionStatus::ALLOWED : PermissionStatus::UNDEFINED;
 }
 
 std::vector<std::string>