1 files changed, 6 insertions, 0 deletions

diff --git a/src/gmcerts.c b/src/gmcerts.c
index 36fd7d55..f95fea7d 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -295,6 +295,9 @@ static void loadIdentities_GmCerts_(iGmCerts *d) {
 }
 
 iGmIdentity *findIdentity_GmCerts(iGmCerts *d, const iBlock *fingerprint) {
+    if (isEmpty_Block(fingerprint)) {
+        return NULL;
+    }
     iForEach(PtrArray, i, &d->idents) {
         iGmIdentity *ident = i.ptr;
         if (cmp_Block(fingerprint, &ident->fingerprint) == 0) { /* TODO: could use a hash */
@@ -549,6 +552,9 @@ const iGmIdentity *constIdentity_GmCerts(const iGmCerts *d, unsigned int id) {
 }
 
 const iGmIdentity *identityForUrl_GmCerts(const iGmCerts *d, const iString *url) {
+    if (isEmpty_String(url)) {
+        return NULL;
+    }
     lock_Mutex(d->mtx);
     const iGmIdentity *found = NULL;
     iConstForEach(PtrArray, i, &d->idents) {