Using some kind of `Option` return type would be better than changing the name. As for changing to throw an exception, I suspect we would want to look at the call sites anyway when making such a change.