Bug 23695: (follow-up) Add exceptions for missing branch parameters