--- a/mod_component_client/mod_component_client.lua	Thu Oct 31 21:58:01 2013 +0100
+++ b/mod_component_client/mod_component_client.lua	Fri Nov 01 18:53:52 2013 -0400
@@ -214,7 +214,7 @@
 	__conn = nil;
 	module:log("error", "connection lost");
 	module:fire_event("component_client/disconnected", { reason = err });
-	if exit_on_disconnect then
+	if exit_on_disconnect and not prosody.shutdown_reason then
 		prosody.shutdown("Shutdown by component_client disconnect");
 	end
 end