Replaced catch Throwable with catch Exception