diff --git a/src/github.com/matrix-org/dendrite/clientapi/storage/output_room_events_table.go b/src/github.com/matrix-org/dendrite/clientapi/storage/output_room_events_table.go
index a31759c3a..3089d5155 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/storage/output_room_events_table.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/storage/output_room_events_table.go
@@ -72,7 +72,7 @@ func (s *outputRoomEventsStatements) Events(txn *sql.Tx, eventIDs []string) ([]g
 	}
 	defer rows.Close()
 
-	result := make([]gomatrixserverlib.Event, len(eventIDs))
+	var result []gomatrixserverlib.Event
 	i := 0
 	for ; rows.Next(); i++ {
 		var eventBytes []byte
@@ -86,7 +86,7 @@ func (s *outputRoomEventsStatements) Events(txn *sql.Tx, eventIDs []string) ([]g
 		result = append(result, ev)
 	}
 	if i != len(eventIDs) {
-		return nil, fmt.Errorf("failed to map all event IDs to events: (%d != %d)", i, len(eventIDs))
+		return nil, fmt.Errorf("failed to map all event IDs to events: (got %d, wanted, %d)", i, len(eventIDs))
 	}
 	return result, nil
 }
diff --git a/sync-server-config.yaml b/sync-server-config.yaml
index cbe452b35..9e8a75690 100644
--- a/sync-server-config.yaml
+++ b/sync-server-config.yaml
@@ -2,7 +2,7 @@
 consumer_uris: ["localhost:9092"]
 
 # The name of the topic which the sync server will consume events from.
-roomserver_topic: "roomserverOutput"
+roomserver_topic: "roomserverOutput2"
 
 # The database URI to store sync server information.
 database: "postgres://dendrite:itsasecret@localhost/syncserver?sslmode=disable"