diff --git a/lib/db_base.cpp b/lib/db_base.cpp
index 1fc445e6..b1adcbe6 100644
--- a/lib/db_base.cpp
+++ b/lib/db_base.cpp
@@ -377,8 +377,10 @@ void db_base::dump(const QString &dir) const
 	}
 
 	try {
-		foreach(pki_base *pki, Store.getAll<pki_base>())
-			pki->writeDefault(dirname);
+		foreach(pki_base *pki, Store.getAll<pki_base>()) {
+			if (pkitype.contains(pki->getType()))
+				pki->writeDefault(dirname);
+		}
 	}
 	catch (errorEx &err) {
 		XCA_ERROR(err);
diff --git a/lib/pki_evp.cpp b/lib/pki_evp.cpp
index 3f7fcd4a..98edb19e 100644
--- a/lib/pki_evp.cpp
+++ b/lib/pki_evp.cpp
@@ -764,7 +764,7 @@ void pki_evp::writeDefault(const QString &dirname) const
 {
 	XFile file(get_dump_filename(dirname, ".pem"));
 	file.open_key();
-	writeKey(file, pki_evp::passwd[0] ? EVP_des_ede3_cbc() : NULL,
+	writeKey(file, pki_evp::passwd.isEmpty() ? NULL : EVP_des_ede3_cbc(),
 			mycb, true);
 }