diff --git a/docs/changes.txt b/docs/changes.txt
index 370e61be6..ec296ea25 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -27,6 +27,7 @@
 - Fixed a hash parsing problem for 7-Zip hashes: allow a longer crc32 data length field within the hash format
 - Fixed a hash parsing problem when using --show/--left with hashes with long salts that required pure kernels
 - Fixed a mask-length check issue: Return -1 in case the mask-length is not within the password-length range
+- Fixed a missing check for returncode in case hashcat.hcstat2 was not found
 - Fixed a restore issue leading to "Restore value is greater than keyspace" when mask-files or wordlist-folders were used
 - Fixed a uninitialized value in OpenCL kernels 9720, 9820 and 10420 leading to absurd benchmark performance
 - Fixed invalid support for SIMD in -m 400
diff --git a/src/mpsp.c b/src/mpsp.c
index 25a15fed7..bbedfcb95 100644
--- a/src/mpsp.c
+++ b/src/mpsp.c
@@ -1387,7 +1387,9 @@ int mask_ctx_init (hashcat_ctx_t *hashcat_ctx)
   mask_ctx->root_table_buf   = (hcstat_table_t *) hccalloc (SP_ROOT_CNT,   sizeof (hcstat_table_t));
   mask_ctx->markov_table_buf = (hcstat_table_t *) hccalloc (SP_MARKOV_CNT, sizeof (hcstat_table_t));
 
-  sp_setup_tbl (hashcat_ctx);
+  const int rc = sp_setup_tbl (hashcat_ctx);
+
+  if (rc == -1) return -1;
 
   mask_ctx->root_css_buf   = (cs_t *) hccalloc (SP_PW_MAX,           sizeof (cs_t));
   mask_ctx->markov_css_buf = (cs_t *) hccalloc (SP_PW_MAX * CHARSIZ, sizeof (cs_t));