Fix #787: federation issue due to missing error handling

Merged Agate requested to merge 787-broken-follow into develop

Closes #787 (closed)

Merge request reports