Narrow down except clause

To avoid masking brainfarts like the ones that led to
bug report below.

Related-bug: #1368835

Change-Id: I028b779e580da7719925a8e127f48bbe1aec211e
Merge "Narrow down except clause"