Avoid "must return a value" warnings

Change-Id: I2b8ac2204ec4f47dcce033da18e31b8bb5285552