Add "case e: Throwable" in some catch blocks