Handle return values in Setup; catch errors & remove unneeded code.