diff --git a/ceph-provisioners/Chart.yaml b/ceph-provisioners/Chart.yaml
index 6df38955e..8c285157b 100644
--- a/ceph-provisioners/Chart.yaml
+++ b/ceph-provisioners/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Provisioner
 name: ceph-provisioners
-version: 0.1.8
+version: 0.1.10
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-provisioners/templates/bin/provisioner/rbd/_namespace-client-ceph-config-manager.sh.tpl b/ceph-provisioners/templates/bin/provisioner/rbd/_namespace-client-ceph-config-manager.sh.tpl
index 5051a3f82..771bb0d62 100644
--- a/ceph-provisioners/templates/bin/provisioner/rbd/_namespace-client-ceph-config-manager.sh.tpl
+++ b/ceph-provisioners/templates/bin/provisioner/rbd/_namespace-client-ceph-config-manager.sh.tpl
@@ -23,7 +23,12 @@ ENDPOINT=$(kubectl get endpoints ceph-mon-discovery -n ${PVC_CEPH_RBD_STORAGECLA
            -v msgr2_port=${MON_PORT_V2} \
            '/"ip"/{print "["version":"$4":"port"/"0","msgr_version":"$4":"msgr2_port"/"0"]"}' | paste -sd',')
 
-echo $ENDPOINT
+if [ -z "$ENDPOINT" ]; then
+  echo "Ceph Mon endpoint is empty"
+  exit 1
+else
+  echo $ENDPOINT
+fi
 
 kubectl get cm ${CEPH_CONF_ETC} -n  ${DEPLOYMENT_NAMESPACE}  -o yaml | \
   sed "s#mon_host.*#mon_host = ${ENDPOINT}#g" | \
diff --git a/releasenotes/notes/ceph-provisioners.yaml b/releasenotes/notes/ceph-provisioners.yaml
index 3ab0c3811..39ce28801 100644
--- a/releasenotes/notes/ceph-provisioners.yaml
+++ b/releasenotes/notes/ceph-provisioners.yaml
@@ -9,4 +9,5 @@ ceph-provisioners:
   - 0.1.6 Update ceph_mon config as per new ceph clients
   - 0.1.7 Use full image ref for docker official images
   - 0.1.8 Enable Ceph CSI Provisioner to Stand Alone
+  - 0.1.10  Add check for empty ceph endpoint
 ...