2 files changed, 21 insertions, 2 deletions
diff --git a/src/base.cpp b/src/base.cpp
index 389f3915a..c0bc40811 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -270,3 +270,18 @@ void StringExtItem::free(void* item)
 {
 	delete static_cast<std::string*>(item);
 }
+
+ModuleException::ModuleException(const std::string &message, Module* who)
+	: CoreException(message, who ? who->ModuleSourceFile : "A Module")
+{
+}
+
+ModuleRef::ModuleRef(Module* v) : value(v)
+{
+	if (value) inc(value);
+}
+
+ModuleRef::~ModuleRef()
+{
+	if (value) dec(value);
+}
diff --git a/src/modules.cpp b/src/modules.cpp
index 87d25ac42..856addbf5 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -51,12 +51,16 @@ void Event::Send()
 
 // These declarations define the behavours of the base class Module (which does nothing at all)
 
-Module::Module() { }
+Module::Module() : refcount(0) { }
 CullResult Module::cull()
 {
 	return classbase::cull();
 }
-Module::~Module() { }
+Module::~Module()
+{
+	if (refcount)
+		ServerInstance->Logs->Log("MODULE", DEFAULT, "References remain to destructed module " + ModuleSourceFile);
+}
 
 ModResult	Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { return MOD_RES_PASSTHRU; }
 void		Module::OnUserConnect(User*) { }