Added try/catch blocks so I can see when things break