Add soft handling if setup has not been run