diff --git a/src/XMPPRoster.m b/src/XMPPRoster.m
index 54c9315..37c5f57 100644
--- a/src/XMPPRoster.m
+++ b/src/XMPPRoster.m
@@ -56,12 +56,12 @@
 
 - (void)dealloc
 {
+	[connection removeDelegate: self];
 	[rosterItems release];
 
 	[super dealloc];
 }
 
-
 - (OFDictionary*)rosterItems
 {
 	return [[rosterItems copy] autorelease];
diff --git a/tests/test.m b/tests/test.m
index 5668a48..561d793 100644
--- a/tests/test.m
+++ b/tests/test.m
@@ -39,7 +39,7 @@
     <OFApplicationDelegate, XMPPConnectionDelegate, XMPPRosterDelegate>
 #endif
 {
-	XMPPConnection * conn;
+	XMPPConnection *conn;
 	XMPPRoster *roster;
 }
 @end