Can you tidy up this try catch shit while you're here, we don't need it.