diff --git a/src/bthread/eloq_module.cpp b/src/bthread/eloq_module.cpp
index 9876bf34..309e457d 100644
--- a/src/bthread/eloq_module.cpp
+++ b/src/bthread/eloq_module.cpp
@@ -23,8 +23,9 @@
 #include "bthread/bthread.h"
 
 extern "C" {
-    bthread::TaskControl* bthread_get_task_control();
+bthread::TaskControl *bthread_get_task_control();
 }
+
 extern std::array<eloq::EloqModule *, 10> registered_modules;
 extern std::atomic<int> registered_module_cnt;
 
@@ -47,6 +48,17 @@ namespace eloq {
     }
 
     int unregister_module(EloqModule *module) {
+        // Verify that the module is currently registered.
+        std::shared_lock s_lk(module_mutex);
+        const bool exists = std::find(registered_modules.begin(),
+                                      registered_modules.end(),
+                                      module) != registered_modules.end();
+        if (!exists) {
+            LOG(WARNING) << "Attempted to unregister a non-registered module: " << module;
+            return -1;
+        }
+        s_lk.unlock();
+
         const auto concurrency = bthread_get_task_control()->concurrency();
         while (module->registered_workers_.load(std::memory_order_acquire) != concurrency) {
             for (int thd_id = 0; thd_id < concurrency; ++thd_id) {