Merge "Fix/hack ErrorPageError to work from non-UI contexts"