Be more explicit about failure cases