Revert "Fixed broken links due to unhandled exceptions"

This reverts commit 3e182c47e242e07b4aa0a52fc786febd676520ea.
Revert "Revert "Fixed broken links due to unhandled exceptions""

This reverts commit 2ed022104811528d82c8e52c379965608f7c47d7.