fix error if org page can't be found + add test to avoid bug in future