diff --git a/sphinx/files/reclass/source/overview/endpoints.rst b/sphinx/files/reclass/source/overview/endpoints.rst
index 8ab919c..ca1b8c4 100644
--- a/sphinx/files/reclass/source/overview/endpoints.rst
+++ b/sphinx/files/reclass/source/overview/endpoints.rst
@@ -13,15 +13,20 @@
       - **Protocol**
       - **Service**
 {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
+{%- if node_grains.get('sphinx_doc', {}) != None %}
 {%- for service_name, service in node_grains.get('sphinx_doc', {}).iteritems() %}
+{%- if service.get('role', {}) != None %}
 {%- for role_name, role in service.get('role', {}).iteritems() %}
+{%- if role.get('endpoint', {}) != None %}
 {%- for endpoint_name, endpoint in role.get('endpoint', {}).iteritems() %}
    *  - {{ endpoint.type }}
       - {{ endpoint.address }}
       - {{ endpoint.protocol }}
       - {{ service_name }}
 {%- endfor %}
+{%- endif %}
 {%- endfor %}
+{%- endif %}
 {%- endfor %}
+{%- endif %}
 {%- endfor %}
-