Added another try/catch :(