Updating setup to be a little better with error handling