Fixed broken links due to unhandled exceptions
Fixed broken links due to unhandled exceptions