Fixed 3rd CR issues. Changed the order of methods calls when creating the uploadBuilder, so that IDE and CI don't complain. Made an extra check where null could be sent into a typehinted setter function.