Added check for nameBuilder