I removed check-catch and check-else to address this.