Add check for valid but empty names