Amazing what you can do when you actually set a return value!

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>