Because Maven interprets an empty string as null, added check to make sure suffix is not null, and to set it to an empty string if it is null.