Handle zero-length name better