diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp
index c217398..b92ed47 100644
--- a/src/libtdeldap.cpp
+++ b/src/libtdeldap.cpp
@@ -1069,6 +1069,10 @@ int LDAPManager::updateUserInfo(LDAPUserInfo user, TQString *errstr) {
 		for (it = user.pkiCertificates.begin(); it != user.pkiCertificates.end(); ++it) {
 			PKICertificateEntry certificateData = *it;
 
+			// Don't attempt to load empty certificates
+			if (certificateData.second.size() < 1)
+				continue;
+
 			TQCString ssldata(certificateData.second);
 			ssldata[certificateData.second.size()] = 0;
 			ssldata.replace("-----BEGIN CERTIFICATE-----", "");
@@ -4750,6 +4754,10 @@ int LDAPManager::generatePKICRL(int expirydays, LDAPRealmConfig realmcfg, TQStri
 			for (it = user.pkiCertificates.begin(); it != user.pkiCertificates.end(); ++it) {
 				PKICertificateEntry certificateData = *it;
 
+				// Don't attempt to load empty certificates
+				if (certificateData.second.size() < 1)
+					continue;
+
 				TQCString ssldata(certificateData.second);
 				ssldata[certificateData.second.size()] = 0;
 				ssldata.replace("-----BEGIN CERTIFICATE-----", "");