Update log paths, catch top-level exceptions again