Continuum

Improve error handling when not able to resolv artifacts