Remove overly broad try/catch block