Exception message still contains 'branch_id' word; not sure if it should be changed - here and on other places (parameter name, method name).