Fix missing return value

Signed-off-by: Geoff Hutchison <geoff.hutchison@gmail.com>

Change-Id: I8655a0c6c75f5f008898e8636f42652192e9aee6
Merge topic 'fix-missing-return-values' into master

3a4c753b Fix missing return value