More consistent return values