Changes to take care of an empty string in setting 'builderName'