Index: src/XMPPRoster.m
==================================================================
--- src/XMPPRoster.m
+++ src/XMPPRoster.m
@@ -54,15 +54,15 @@
 	return self;
 }
 
 - (void)dealloc
 {
+	[connection removeDelegate: self];
 	[rosterItems release];
 
 	[super dealloc];
 }
-
 
 - (OFDictionary*)rosterItems
 {
 	return [[rosterItems copy] autorelease];
 }

Index: tests/test.m
==================================================================
--- tests/test.m
+++ tests/test.m
@@ -37,11 +37,11 @@
 @interface AppDelegate: OFObject
 #ifdef OF_HAVE_OPTIONAL_PROTOCOLS
     <OFApplicationDelegate, XMPPConnectionDelegate, XMPPRosterDelegate>
 #endif
 {
-	XMPPConnection * conn;
+	XMPPConnection *conn;
 	XMPPRoster *roster;
 }
 @end
 
 OF_APPLICATION_DELEGATE(AppDelegate)