Fix issue on popular feeds
Ensure error is passed
Update build
Update tests