--- a/core/rostermanager.lua	Fri Apr 03 21:42:30 2015 +0200
+++ b/core/rostermanager.lua	Sun Apr 05 16:19:02 2015 +0200
@@ -86,12 +86,11 @@
 		metadata = { broken = err or nil };
 		roster[false] = metadata;
 	end
-	if not metadata.pending then
-		if roster.pending and not type(roster.pending.subscription) == "string" then
-			metadata.pending, roster.pending = roster.pending, nil;
-		else
-			metadata.pending = {};
-		end
+	if roster.pending and type(roster.pending.subscription) ~= "string" then
+		metadata.pending = roster.pending;
+		roster.pending = nil;
+	elseif not metadata.pending then
+		metadata.pending = {};
 	end
 	return metadata;
 end