diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go
index a3ede6197c..f09f0ce425 100644
--- a/cmd/prometheus/main.go
+++ b/cmd/prometheus/main.go
@@ -285,6 +285,7 @@ func main() {
 		discoveryManager.ApplyConfig,
 		webHandler.ApplyConfig,
 		notifier.ApplyConfig,
+		scrapeManager.ApplyConfig,
 		func(cfg *config.Config) error {
 			// Get all rule files matching the configuration oaths.
 			var files []string
diff --git a/retrieval/manager.go b/retrieval/manager.go
index dec7f8d9b3..4f1f9775c9 100644
--- a/retrieval/manager.go
+++ b/retrieval/manager.go
@@ -61,7 +61,9 @@ func (m *ScrapeManager) Run(tsets <-chan map[string][]*config.TargetGroup) error
 		case f := <-m.actionCh:
 			f()
 		case ts := <-tsets:
-			m.reload(ts)
+			if err := m.reload(ts); err != nil {
+				level.Error(m.logger).Log("msg", "error reloading the scrape manager", "err", err)
+			}
 		case <-m.graceShut:
 			return nil
 		}