2 files changed, 8 insertions, 2 deletions
diff --git a/Swiften/Queries/Responders/RosterPushResponder.h b/Swiften/Queries/Responders/RosterPushResponder.h
index 8c57fd3..48111a7 100644
--- a/Swiften/Queries/Responders/RosterPushResponder.h
+++ b/Swiften/Queries/Responders/RosterPushResponder.h
@@ -22,7 +22,7 @@ namespace Swift {
 		private:
 			virtual bool handleSetRequest(const JID& from, const String& id, boost::shared_ptr<RosterPayload> payload) {
 				onRosterReceived(payload);
-				sendResponse(from, id, boost::shared_ptr<Payload>());
+				sendResponse(from, id, boost::shared_ptr<RosterPayload>());
 				return true;
 			}
 	};
diff --git a/Swiften/Queries/Responders/UnitTest/DiscoInfoResponderTest.cpp b/Swiften/Queries/Responders/UnitTest/DiscoInfoResponderTest.cpp
index 62d9aca..20fa9ff 100644
--- a/Swiften/Queries/Responders/UnitTest/DiscoInfoResponderTest.cpp
+++ b/Swiften/Queries/Responders/UnitTest/DiscoInfoResponderTest.cpp
@@ -35,7 +35,8 @@ class DiscoInfoResponderTest : public CppUnit::TestFixture {
 		}
 
 		void testHandleRequest_GetToplevelInfo() {
-			DiscoInfoResponder testling(router_); 
+			DiscoInfoResponder testling(router_);
+			testling.start();
 			DiscoInfo discoInfo;
 			discoInfo.addFeature("foo");
 			testling.setDiscoInfo(discoInfo);
@@ -48,10 +49,13 @@ class DiscoInfoResponderTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT(payload);
 			CPPUNIT_ASSERT_EQUAL(String(""), payload->getNode());
 			CPPUNIT_ASSERT(payload->hasFeature("foo"));
+
+			testling.stop();
 		}
 
 		void testHandleRequest_GetNodeInfo() {
 			DiscoInfoResponder testling(router_); 
+			testling.start();
 			DiscoInfo discoInfo;
 			discoInfo.addFeature("foo");
 			testling.setDiscoInfo(discoInfo);
@@ -68,6 +72,8 @@ class DiscoInfoResponderTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT(payload);
 			CPPUNIT_ASSERT_EQUAL(String("bar-node"), payload->getNode());
 			CPPUNIT_ASSERT(payload->hasFeature("bar"));
+
+			testling.stop();
 		}
 
 		void testHandleRequest_GetInvalidNodeInfo() {