diff --git a/docs/cluster/cluster.html b/docs/cluster/cluster.html
index dbb6cec5e..21950889a 100644
--- a/docs/cluster/cluster.html
+++ b/docs/cluster/cluster.html
@@ -487,8 +487,8 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
 
 def get_cluster(cluster_name: str, namespace: str = &#34;default&#34;):
     try:
-        config.load_kube_config()
-        api_instance = client.CustomObjectsApi()
+        config_check()
+        api_instance = client.CustomObjectsApi(api_config_handler())
         rcs = api_instance.list_namespaced_custom_object(
             group=&#34;ray.io&#34;,
             version=&#34;v1alpha1&#34;,
@@ -509,7 +509,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
 # private methods
 def _get_ingress_domain():
     try:
-        config.load_kube_config()
+        config_check()
         api_client = client.CustomObjectsApi(api_config_handler())
         ingress = api_client.get_cluster_custom_object(
             &#34;config.openshift.io&#34;, &#34;v1&#34;, &#34;ingresses&#34;, &#34;cluster&#34;
@@ -604,7 +604,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.cluster</code></h1>
 
 
 def _map_to_ray_cluster(rc) -&gt; Optional[RayCluster]:
-    if &#34;state&#34; in rc[&#34;status&#34;]:
+    if &#34;status&#34; in rc and &#34;state&#34; in rc[&#34;status&#34;]:
         status = RayClusterStatus(rc[&#34;status&#34;][&#34;state&#34;].lower())
     else:
         status = RayClusterStatus.UNKNOWN
@@ -694,8 +694,8 @@ <h2 class="section-title" id="header-functions">Functions</h2>
 </summary>
 <pre><code class="python">def get_cluster(cluster_name: str, namespace: str = &#34;default&#34;):
     try:
-        config.load_kube_config()
-        api_instance = client.CustomObjectsApi()
+        config_check()
+        api_instance = client.CustomObjectsApi(api_config_handler())
         rcs = api_instance.list_namespaced_custom_object(
             group=&#34;ray.io&#34;,
             version=&#34;v1alpha1&#34;,
diff --git a/docs/utils/generate_yaml.html b/docs/utils/generate_yaml.html
index ea1e73026..6d94e4c71 100644
--- a/docs/utils/generate_yaml.html
+++ b/docs/utils/generate_yaml.html
@@ -54,7 +54,7 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
 import uuid
 from kubernetes import client, config
 from .kube_api_helpers import _kube_api_error_handling
-from ..cluster.auth import api_config_handler
+from ..cluster.auth import api_config_handler, config_check
 
 
 def read_template(template):
@@ -299,7 +299,7 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
 
     command = command.replace(&#34;deployment-name&#34;, cluster_name)
     try:
-        config.load_kube_config()
+        config_check()
         api_client = client.CustomObjectsApi(api_config_handler())
         ingress = api_client.get_cluster_custom_object(
             &#34;config.openshift.io&#34;, &#34;v1&#34;, &#34;ingresses&#34;, &#34;cluster&#34;
@@ -542,7 +542,7 @@ <h2 class="section-title" id="header-functions">Functions</h2>
 
     command = command.replace(&#34;deployment-name&#34;, cluster_name)
     try:
-        config.load_kube_config()
+        config_check()
         api_client = client.CustomObjectsApi(api_config_handler())
         ingress = api_client.get_cluster_custom_object(
             &#34;config.openshift.io&#34;, &#34;v1&#34;, &#34;ingresses&#34;, &#34;cluster&#34;