rather than returning -1

Found-by: andrew
Patch-by: Damjan Jovanovic

(cherry picked from commit 175afdcb)

Change-Id: I996bbfa82b10716318944f390ea53e0a5ae7c89c