diff --git a/certoperations.js b/certoperations.js
index c2846546..41b61888 100644
--- a/certoperations.js
+++ b/certoperations.js
@@ -991,7 +991,15 @@ module.exports.CertificateOperations = function (parent) {
                 return r;
             }
         }
-        if (parent.configurationFiles != null) { console.log("Error: Vault/Database missing some certificates."); process.exit(0); return null; }
+        if (parent.configurationFiles != null) {
+            console.log("Error: Vault/Database missing some certificates.");
+            if (r.root == null) { console.log('  Code signing certificate is missing.'); }
+            if (r.web == null) { console.log('  HTTPS web certificate is missing.'); }
+            if (r.mps == null) { console.log('  Intel AMT MPS certificate is missing.'); }
+            if (r.agent == null) { console.log('  Server agent authentication certificate is missing.'); }
+            if (r.codesign == null) { console.log('  Agent code signing certificate is missing.'); }
+            process.exit(0); return null;
+        }
 
         console.log("Generating certificates, may take a few minutes...");
         parent.updateServerState('state', 'generatingcertificates');
diff --git a/package.json b/package.json
index 9b756b45..84449919 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.0.57",
+  "version": "1.0.58",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",