Improve error reporting when following journals Upstream-commit: 0dac5444489a34e86bd3e289b33fab3f17c1bf70 Component: engine