Trap another small error

Change-Id: I894254df82f3af0fd2bceeb00955dc06b1a8f9b1