Fixes error "All control paths should return a value". Change-Id: I4718688b55b24862465e15ea0d64b32fa44b3299