Fixes links, removes try/catch blocks