diff --git a/Bot/IRC_Bot.h b/Bot/IRC_Bot.h
index 6e07ea6..c0700d3 100644
--- a/Bot/IRC_Bot.h
+++ b/Bot/IRC_Bot.h
@@ -103,6 +103,11 @@ public:
 	*/
 	int OnRehash();
 
+	/**
+	* @brief Shouldn't ever happen; returns removed.
+	*/
+	bool OnBadRehash(bool removed) { return removed; };
+
 	/** Constructor for IRC_Bot */
 	IRC_Bot(const Jupiter::ReadableString &configSection);
 
diff --git a/Bot/Main.cpp b/Bot/Main.cpp
index a9c9991..cf2f119 100644
--- a/Bot/Main.cpp
+++ b/Bot/Main.cpp
@@ -133,7 +133,7 @@ int main(int argc, const char **args)
 	while (1)
 	{
 		for (size_t i = 0; i < Jupiter::plugins->size(); i++)
-			if (Jupiter::plugins->get(i)->think() != 0)
+			if (Jupiter::plugins->get(i)->shouldRemove() || Jupiter::plugins->get(i)->think() != 0)
 				Jupiter::freePlugin(i);
 		Jupiter_checkTimers();
 		serverManager->think();
diff --git a/Jupiter b/Jupiter
index 5850b6f..8273d51 160000
--- a/Jupiter
+++ b/Jupiter
@@ -1 +1 @@
-Subproject commit 5850b6f7a472a3ee801ba9a7281494ac7564dba7
+Subproject commit 8273d519ae8615019152e30410c3b27c65ba40cb
diff --git a/Release/Bot.lib b/Release/Bot.lib
index 6e7fae3..bae6022 100644
Binary files a/Release/Bot.lib and b/Release/Bot.lib differ
diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib
index 681f6d6..c3edf21 100644
Binary files a/Release/Plugins/RenX.Core.lib and b/Release/Plugins/RenX.Core.lib differ