Issue #1: broken links can hose conttest (fixes #1)