Well, couldn't you make the fallback use an empty string too, to be consistent with the new code ?