add milestone not null check