Added more handling for blank name parses.