CB-5365 Remove unused exception var to prevent warnings?