diff --git a/src/messaging.js b/src/messaging.js
index 1a8dabb9b2..e78664d6d0 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -418,7 +418,9 @@ var async = require('async'),
 							next();
 						}
 					});
-				}, next);
+				}, function(err) {
+					next(err, roomId);
+				});
 			}
 		], callback);
 	};