Return more, fail less
Appease the borrow checker more cleanly