Prevent NPEs from happening
Artifact rename + version bump