diff --git a/lib/shared/addon/components/cru-cloud-provider/component.js b/lib/shared/addon/components/cru-cloud-provider/component.js
index b446dc91e..a0c99c9fe 100644
--- a/lib/shared/addon/components/cru-cloud-provider/component.js
+++ b/lib/shared/addon/components/cru-cloud-provider/component.js
@@ -78,7 +78,7 @@ export default Component.extend({
 
       let config = get(this, 'cluster.rancherKubernetesEngineConfig');
 
-      if (get(config, 'cloudProvider')) {
+      if (config && get(config, 'cloudProvider')) {
         delete config.cloudProvider;
       }
 
@@ -100,7 +100,7 @@ export default Component.extend({
     let nue                   = {};
     let selectedCloudProvider = get(this, 'selectedCloudProvider');
     let cluster               = get(this, 'cluster');
-    let config                = get(cluster, 'rancherKubernetesEngineConfig');
+    let config                = get(cluster, 'rancherKubernetesEngineConfig') || set(cluster, 'rancherKubernetesEngineConfig', {});
 
     switch (selectedCloudProvider) {
     case 'azure':