Add polling to handle bad creds etc.