Handle unset @origin a little more gracefully