diff --git a/src/core/lib/PGP.mjs b/src/core/lib/PGP.mjs
index 24e6ae85..8970b486 100644
--- a/src/core/lib/PGP.mjs
+++ b/src/core/lib/PGP.mjs
@@ -10,6 +10,7 @@
  *
  */
 
+import OperationError from "../errors/OperationError";
 import kbpgp from "kbpgp";
 import promisifyDefault from "es6-promisify";
 const promisify = promisifyDefault.promisify;
@@ -86,12 +87,12 @@ export async function importPrivateKey(privateKey, passphrase) {
                     passphrase
                 });
             } else {
-                throw "Did not provide passphrase with locked private key.";
+                throw new OperationError("Did not provide passphrase with locked private key.");
             }
         }
         return key;
     } catch (err) {
-        throw `Could not import private key: ${err}`;
+        throw new OperationError(`Could not import private key: ${err}`);
     }
 }
 
@@ -111,6 +112,6 @@ export async function importPublicKey (publicKey) {
         });
         return key;
     } catch (err) {
-        throw `Could not import public key: ${err}`;
+        throw new OperationError(`Could not import public key: ${err}`);
     }
 }
diff --git a/src/core/operations/BcryptParse.mjs b/src/core/operations/BcryptParse.mjs
index e72d18d2..149bdaa0 100644
--- a/src/core/operations/BcryptParse.mjs
+++ b/src/core/operations/BcryptParse.mjs
@@ -5,6 +5,7 @@
  */
 
 import Operation from "../Operation";
+import OperationError from "../errors/OperationError";
 import bcrypt from "bcryptjs";
 
 /**
@@ -38,7 +39,7 @@ Salt: ${bcrypt.getSalt(input)}
 Password hash: ${input.split(bcrypt.getSalt(input))[1]}
 Full hash: ${input}`;
         } catch (err) {
-            return "Error: " + err.toString();
+            throw new OperationError("Error: " + err.toString());
         }
     }