Should we perhaps be testing the return value for error?