Make return values consistent

Tipsy does not expect a return value.

Change-Id: I9172dfe18ee1dc6d7773ce861a8a8b52638bc7b6