Port loadArtifact fix to updateArtifact

Soooooo..... have to find time to reduce this code overlap!