diff --git a/kc-app/src/KeymasterUI.js b/kc-app/src/KeymasterUI.js
index cab419b5..299ecc86 100644
--- a/kc-app/src/KeymasterUI.js
+++ b/kc-app/src/KeymasterUI.js
@@ -48,6 +48,7 @@ function KeymasterUI({ keymaster, title }) {
     const [mnemonicString, setMnemonicString] = useState('');
     const [walletString, setWalletString] = useState('');
     const [manifest, setManifest] = useState(null);
+    const [checkingWallet, setCheckingWallet] = useState(false);
 
     useEffect(() => {
         refreshAll();
@@ -657,6 +658,25 @@ function KeymasterUI({ keymaster, title }) {
         }
     }
 
+    async function checkWallet() {
+        setCheckingWallet(true);
+        try {
+            const { checked, invalid, deleted } = await keymaster.checkWallet();
+
+            if (invalid == 0 && deleted == 0) {
+                window.alert(`${checked} DIDs checked, no problems found`);
+            }
+            else if (window.confirm(`${checked} DIDs checked\n${invalid} invalid DIDs found\n${deleted} deleted DIDs found\n\nFix wallet?`)) {
+                const { idsRemoved, ownedRemoved, heldRemoved } = await keymaster.fixWallet();
+                window.alert(`${idsRemoved} IDs removed\n${ownedRemoved} owned DIDs removed\n${heldRemoved} held DIDs removed`);
+            }
+
+        } catch (error) {
+            window.alert(error);
+        }
+        setCheckingWallet(false);
+    }
+
     async function showWallet() {
         try {
             const wallet = await keymaster.loadWallet();
@@ -1420,6 +1440,11 @@ function KeymasterUI({ keymaster, title }) {
                                         Recover...
                                     </Button>
                                 </Grid>
+                                <Grid item>
+                                    <Button variant="contained" color="primary" onClick={checkWallet} disabled={checkingWallet}>
+                                        Check...
+                                    </Button>
+                                </Grid>
                             </Grid>
                             <p />
                             <Grid container direction="row" justifyContent="flex-start" alignItems="center" spacing={3}>
@@ -1434,14 +1459,6 @@ function KeymasterUI({ keymaster, title }) {
                                         </Button>
                                     )}
                                 </Grid>
-                                <Grid item>
-                                    <Box>
-                                        <pre>{mnemonicString}</pre>
-                                    </Box>
-                                </Grid>
-                            </Grid>
-                            <p />
-                            <Grid container direction="row" justifyContent="flex-start" alignItems="center" spacing={3}>
                                 <Grid item>
                                     {walletString ? (
                                         <Button variant="contained" color="primary" onClick={hideWallet}>
@@ -1465,6 +1482,9 @@ function KeymasterUI({ keymaster, title }) {
                                 </Grid>
                             </Grid>
                             <p />
+                            <Box>
+                                <pre>{mnemonicString}</pre>
+                            </Box>
                             <Box>
                                 {walletString &&
                                     <textarea
diff --git a/kc-app/src/keymaster-sdk.js b/kc-app/src/keymaster-sdk.js
index 1b0c877e..25a75280 100644
--- a/kc-app/src/keymaster-sdk.js
+++ b/kc-app/src/keymaster-sdk.js
@@ -58,6 +58,26 @@ export async function recoverWallet() {
     }
 }
 
+export async function checkWallet() {
+    try {
+        const response = await axios.post(`/api/v1/check-wallet`);
+        return response.data;
+    }
+    catch (error) {
+        throwError(error);
+    }
+}
+
+export async function fixWallet() {
+    try {
+        const response = await axios.post(`/api/v1/fix-wallet`);
+        return response.data;
+    }
+    catch (error) {
+        throwError(error);
+    }
+}
+
 export async function decryptMnemonic() {
     try {
         const response = await axios.get(`/api/v1/mnemonic`);
diff --git a/keymaster-api.js b/keymaster-api.js
index 6b674cac..c16c0149 100644
--- a/keymaster-api.js
+++ b/keymaster-api.js
@@ -82,6 +82,24 @@ v1router.post('/recover-wallet', async (req, res) => {
     }
 });
 
+v1router.post('/check-wallet', async (req, res) => {
+    try {
+        const response = await keymaster.checkWallet();
+        res.json(response);
+    } catch (error) {
+        res.status(500).send(error.toString());
+    }
+});
+
+v1router.post('/fix-wallet', async (req, res) => {
+    try {
+        const response = await keymaster.fixWallet();
+        res.json(response);
+    } catch (error) {
+        res.status(500).send(error.toString());
+    }
+});
+
 v1router.get('/mnemonic', async (req, res) => {
     try {
         const mnemonic = keymaster.decryptMnemonic();
diff --git a/keymaster-app/src/KeymasterUI.js b/keymaster-app/src/KeymasterUI.js
index cab419b5..299ecc86 100644
--- a/keymaster-app/src/KeymasterUI.js
+++ b/keymaster-app/src/KeymasterUI.js
@@ -48,6 +48,7 @@ function KeymasterUI({ keymaster, title }) {
     const [mnemonicString, setMnemonicString] = useState('');
     const [walletString, setWalletString] = useState('');
     const [manifest, setManifest] = useState(null);
+    const [checkingWallet, setCheckingWallet] = useState(false);
 
     useEffect(() => {
         refreshAll();
@@ -657,6 +658,25 @@ function KeymasterUI({ keymaster, title }) {
         }
     }
 
+    async function checkWallet() {
+        setCheckingWallet(true);
+        try {
+            const { checked, invalid, deleted } = await keymaster.checkWallet();
+
+            if (invalid == 0 && deleted == 0) {
+                window.alert(`${checked} DIDs checked, no problems found`);
+            }
+            else if (window.confirm(`${checked} DIDs checked\n${invalid} invalid DIDs found\n${deleted} deleted DIDs found\n\nFix wallet?`)) {
+                const { idsRemoved, ownedRemoved, heldRemoved } = await keymaster.fixWallet();
+                window.alert(`${idsRemoved} IDs removed\n${ownedRemoved} owned DIDs removed\n${heldRemoved} held DIDs removed`);
+            }
+
+        } catch (error) {
+            window.alert(error);
+        }
+        setCheckingWallet(false);
+    }
+
     async function showWallet() {
         try {
             const wallet = await keymaster.loadWallet();
@@ -1420,6 +1440,11 @@ function KeymasterUI({ keymaster, title }) {
                                         Recover...
                                     </Button>
                                 </Grid>
+                                <Grid item>
+                                    <Button variant="contained" color="primary" onClick={checkWallet} disabled={checkingWallet}>
+                                        Check...
+                                    </Button>
+                                </Grid>
                             </Grid>
                             <p />
                             <Grid container direction="row" justifyContent="flex-start" alignItems="center" spacing={3}>
@@ -1434,14 +1459,6 @@ function KeymasterUI({ keymaster, title }) {
                                         </Button>
                                     )}
                                 </Grid>
-                                <Grid item>
-                                    <Box>
-                                        <pre>{mnemonicString}</pre>
-                                    </Box>
-                                </Grid>
-                            </Grid>
-                            <p />
-                            <Grid container direction="row" justifyContent="flex-start" alignItems="center" spacing={3}>
                                 <Grid item>
                                     {walletString ? (
                                         <Button variant="contained" color="primary" onClick={hideWallet}>
@@ -1465,6 +1482,9 @@ function KeymasterUI({ keymaster, title }) {
                                 </Grid>
                             </Grid>
                             <p />
+                            <Box>
+                                <pre>{mnemonicString}</pre>
+                            </Box>
                             <Box>
                                 {walletString &&
                                     <textarea
diff --git a/rebuildGatekeeper b/rebuildGatekeeper
index 14466643..98835f38 100755
--- a/rebuildGatekeeper
+++ b/rebuildGatekeeper
@@ -1,2 +1,5 @@
 #!/usr/bin/env bash
-npm --prefix ./keymaster-app run build && node gatekeeper-api.js
+set -e
+
+npm --prefix ./keymaster-app run build
+node gatekeeper-api.js
diff --git a/rebuildKeymaster b/rebuildKeymaster
index c6986e24..5d0e29e9 100755
--- a/rebuildKeymaster
+++ b/rebuildKeymaster
@@ -1,2 +1,5 @@
 #!/usr/bin/env bash
-npm --prefix ./kc-app run build && node keymaster-api.js
+set -e
+
+npm --prefix ./kc-app run build
+node keymaster-api.js