diff --git a/panoramix/models.py b/panoramix/models.py
index f6018e8072ef3..cf5f82b4499bb 100644
--- a/panoramix/models.py
+++ b/panoramix/models.py
@@ -610,10 +610,11 @@ class Cluster(Model, AuditMixinNullable):
     cluster_name = Column(String(250), unique=True)
     coordinator_host = Column(String(256))
     coordinator_port = Column(Integer)
-    coordinator_endpoint = Column(String(256))
+    coordinator_endpoint = Column(
+        String(256), default='druid/coordinator/v1/metadata')
     broker_host = Column(String(256))
     broker_port = Column(Integer)
-    broker_endpoint = Column(String(256))
+    broker_endpoint = Column(String(256), default='druid/v2')
     metadata_last_refreshed = Column(DateTime)
 
     def __repr__(self):
diff --git a/panoramix/views.py b/panoramix/views.py
index 1930d6b846ccd..9a36c1cd11677 100644
--- a/panoramix/views.py
+++ b/panoramix/views.py
@@ -411,7 +411,13 @@ def dashboard(self, id_):
     def refresh_datasources(self):
         session = db.session()
         for cluster in session.query(models.Cluster).all():
-            cluster.refresh_datasources()
+            try:
+                cluster.refresh_datasources()
+            except Exception as e:
+                flash(
+                    "Error while processing cluster '{}'".format(cluster),
+                    "alert")
+                return redirect('/clustermodelview/list/')
             cluster.metadata_last_refreshed = datetime.now()
             flash(
                 "Refreshed metadata from cluster "