Handle null cases
Update artifacts