diff --git a/pkg/poller/prometheus.go b/pkg/poller/prometheus.go
index 944e4c34..28371c9a 100644
--- a/pkg/poller/prometheus.go
+++ b/pkg/poller/prometheus.go
@@ -35,7 +35,7 @@ func (u *UnifiPoller) ExportMetrics() (*metrics.Metrics, error) {
 		u.LogErrorf("collecting metrics: %v", err)
 		u.Logf("Re-authenticating to UniFi Controller")
 
-		if err := u.Unifi.Login(); err != nil {
+		if err := u.GetUnifi(); err != nil {
 			u.LogErrorf("re-authenticating: %v", err)
 			return nil, err
 		}
diff --git a/pkg/poller/unifi.go b/pkg/poller/unifi.go
index 9c924441..ce9ac2e7 100644
--- a/pkg/poller/unifi.go
+++ b/pkg/poller/unifi.go
@@ -76,20 +76,20 @@ func (u *UnifiPoller) CollectMetrics() (*metrics.Metrics, error) {
 	var err error
 	// Get the sites we care about.
 	if m.Sites, err = u.GetFilteredSites(); err != nil {
-		u.LogErrorf("unifi.GetSites(): %v", err)
+		return m, fmt.Errorf("unifi.GetSites(): %v", err)
 	}
 	if u.Config.SaveIDS {
 		m.IDSList, err = u.Unifi.GetIDS(m.Sites, time.Now().Add(u.Config.Interval.Duration), time.Now())
-		u.LogErrorf("unifi.GetIDS(): %v", err)
+		return m, fmt.Errorf("unifi.GetIDS(): %v", err)
 	}
 	// Get all the points.
 	if m.Clients, err = u.Unifi.GetClients(m.Sites); err != nil {
-		u.LogErrorf("unifi.GetClients(): %v", err)
+		return m, fmt.Errorf("unifi.GetClients(): %v", err)
 	}
 	if m.Devices, err = u.Unifi.GetDevices(m.Sites); err != nil {
-		u.LogErrorf("unifi.GetDevices(): %v", err)
+		return m, fmt.Errorf("unifi.GetDevices(): %v", err)
 	}
-	return m, err
+	return m, nil
 }
 
 // AugmentMetrics is our middleware layer between collecting metrics and writing them.