diff --git a/waku/waku_keystore/conversion_utils.nim b/waku/waku_keystore/conversion_utils.nim
index 1cb8ba235c..4a76811114 100644
--- a/waku/waku_keystore/conversion_utils.nim
+++ b/waku/waku_keystore/conversion_utils.nim
@@ -21,7 +21,7 @@ proc decode*(encodedCredential: seq[byte]): KeystoreResult[KeystoreMembership] =
     return err(
       AppKeystoreError(
         kind: KeystoreJsonError,
-        msg: "error in conversion_utils decode: " & getCurrentExceptionMsg(),
+        msg: "error during decoding credentials: " & getCurrentExceptionMsg(),
       )
     )
   except Exception: #parseJson raises Exception
diff --git a/waku/waku_keystore/keystore.nim b/waku/waku_keystore/keystore.nim
index e46128efa2..9741761ff7 100644
--- a/waku/waku_keystore/keystore.nim
+++ b/waku/waku_keystore/keystore.nim
@@ -34,7 +34,7 @@ proc createAppKeystore*(
     err(
       AppKeystoreError(
         kind: KeystoreOsError,
-        msg: "error in createAppKeystore: " & getCurrentExceptionMsg(),
+        msg: "error while writing keystore: " & getCurrentExceptionMsg(),
       )
     )
   finally:
@@ -122,35 +122,38 @@ proc loadAppKeystore*(
         return err(
           AppKeystoreError(
             kind: KeystoreJsonError,
-            msg: "error in loadAppKeystore: " & getCurrentExceptionMsg(),
+            msg:
+              "error during loading keystore, JsonParsingError: " &
+              getCurrentExceptionMsg(),
           )
         )
       except ValueError:
         return err(
           AppKeystoreError(
             kind: KeystoreJsonError,
-            msg: "error in loadAppKeystore: " & getCurrentExceptionMsg(),
+            msg:
+              "error during loading keystore, ValueError: " & getCurrentExceptionMsg(),
           )
         )
       except OSError:
         return err(
           AppKeystoreError(
             kind: KeystoreOsError,
-            msg: "error in loadAppKeystore: " & getCurrentExceptionMsg(),
+            msg: "error during loading keystore, OSError: " & getCurrentExceptionMsg(),
           )
         )
       except Exception: #parseJson raises Exception
         return err(
           AppKeystoreError(
             kind: KeystoreOsError,
-            msg: "error in loadAppKeystore: " & getCurrentExceptionMsg(),
+            msg: "error during loading keystore, Exception: " & getCurrentExceptionMsg(),
           )
         )
   except IOError:
     return err(
       AppKeystoreError(
         kind: KeystoreIoError,
-        msg: "error in loadAppKeystore: " & getCurrentExceptionMsg(),
+        msg: "error during loading keystore, IOError: " & getCurrentExceptionMsg(),
       )
     )