diff --git a/package.json b/package.json
index 4575cdb..501db0b 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.3",
   "private": true,
   "author": "scott.e.graves@gmail.com",
-  "description": "GUI for Repertory - Repertory allows you to mount Hyperspace, Sia and/or SiaPrime blockchain storage solutions via FUSE on Linux/OS X or via WinFSP on Windows.",
+  "description": "GUI for Repertory - Repertory allows you to mount Sia and/or SiaPrime blockchain storage solutions via FUSE on Linux/OS X or via WinFSP on Windows.",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.17",
     "@fortawesome/free-solid-svg-icons": "^5.8.1",
diff --git a/public/electron.js b/public/electron.js
index 783f14f..1d6857a 100644
--- a/public/electron.js
+++ b/public/electron.js
@@ -692,21 +692,6 @@ ipcMain.on(Constants.IPC_Install_Dependency, (event, data) => {
 ipcMain.on(Constants.IPC_Install_Upgrade, (event, data) => {
   let tempSig;
   let tempPub;
-  const hasSignature = data.Signature && (data.Signature.length > 0);
-  const hasHash = data.Sha256 && (data.Sha256.length > 0);
-  if (hasSignature) {
-    try {
-      const files = helpers.createSignatureFiles(data.Signature, publicKey);
-      tempPub = files.PublicKeyFile;
-      tempSig = files.SignatureFile;
-    } catch (e) {
-      standardIPCReply(event, Constants.IPC_Install_Upgrade_Reply, {
-        Source: data.Source,
-      }, e);
-      return;
-    }
-  }
-
   const cleanupFiles = () => {
     try {
       if (tempSig) {
@@ -719,6 +704,26 @@ ipcMain.on(Constants.IPC_Install_Upgrade, (event, data) => {
     }
   };
 
+  const errorHandler = err => {
+    cleanupFiles();
+    standardIPCReply(event, Constants.IPC_Install_Upgrade_Reply, {
+      Source: data.Source,
+    }, err);
+  };
+
+  const hasSignature = data.Signature && (data.Signature.length > 0);
+  const hasHash = data.Sha256 && (data.Sha256.length > 0);
+  if (hasSignature) {
+    try {
+      const files = helpers.createSignatureFiles(data.Signature, publicKey);
+      tempPub = files.PublicKeyFile;
+      tempSig = files.SignatureFile;
+    } catch (e) {
+      errorHandler(e);
+      return;
+    }
+  }
+
   let command;
   let args;
   const platform = os.platform();
@@ -735,16 +740,10 @@ ipcMain.on(Constants.IPC_Install_Upgrade, (event, data) => {
       command = execPath;
       args = [data.Source];
     } catch (e) {
-      cleanupFiles();
-      standardIPCReply(event, Constants.IPC_Install_Upgrade_Reply, {
-        Source: data.Source,
-      }, e);
+      errorHandler(e);
     }
   } else {
-    cleanupFiles();
-    standardIPCReply(event, Constants.IPC_Install_Upgrade_Reply, {
-      Source: data.Source,
-    }, Error('Platform not supported: ' + os.platform()));
+    errorHandler(Error('Platform not supported: ' + os.platform()));
   }
 
   if (command) {
@@ -756,10 +755,7 @@ ipcMain.on(Constants.IPC_Install_Upgrade, (event, data) => {
           closeApplication();
         })
         .catch(error => {
-          cleanupFiles();
-          standardIPCReply(event, Constants.IPC_Install_Upgrade_Reply, {
-            Source: data.Source,
-          }, error);
+          errorHandler(error);
         });
     };
 
@@ -770,10 +766,7 @@ ipcMain.on(Constants.IPC_Install_Upgrade, (event, data) => {
           executeInstall();
         })
         .catch(() => {
-          cleanupFiles();
-          standardIPCReply(event, Constants.IPC_Install_Upgrade_Reply, {
-            Source: data.Source,
-          }, 'Failed to verify installation package signature');
+          errorHandler(Error('Failed to verify installation package signature'));
         });
     } else if (hasHash) {
       helpers
@@ -782,19 +775,13 @@ ipcMain.on(Constants.IPC_Install_Upgrade, (event, data) => {
           executeInstall();
         })
         .catch(() => {
-          cleanupFiles();
-          standardIPCReply(event, Constants.IPC_Install_Upgrade_Reply, {
-            Source: data.Source,
-          }, 'Failed to verify installation package hash');
+          errorHandler(Error('Failed to verify installation package hash'));
         });
     } else {
       executeInstall();
     }
   } else {
-    cleanupFiles();
-    standardIPCReply(event, Constants.IPC_Install_Upgrade_Reply, {
-      Source: data.Source,
-    }, Error('Unsupported upgrade: ' + data.Source));
+    errorHandler(Error('Unsupported upgrade: ' + data.Source));
   }
 });