diff --git a/src/module.c b/src/module.c
index 3dc524b7..8aa82820 100644
--- a/src/module.c
+++ b/src/module.c
@@ -63,6 +63,9 @@ int                     module_container_add_module(module_container_t *self, mo
     if (!self)
         return -1;
 
+    if (refobject_ref(module) != 0)
+        return -1;
+
     thread_mutex_lock(&(self->lock));
     avl_insert(self->module, module);
     thread_mutex_unlock(&(self->lock));
@@ -105,6 +108,7 @@ module_t *              module_container_get_module(module_container_t *self, co
     }
 
     refobject_unref(search);
+    refobject_ref(ret);
 
     return ret;
 }