diff --git a/cra-client/src/components/Dino/components/details-panel/ServerConfigEventBusDisplay.js b/cra-client/src/components/Dino/components/details-panel/ServerConfigEventBusDisplay.js
index 20cca381..acfd6aec 100644
--- a/cra-client/src/components/Dino/components/details-panel/ServerConfigEventBusDisplay.js
+++ b/cra-client/src/components/Dino/components/details-panel/ServerConfigEventBusDisplay.js
@@ -22,9 +22,9 @@ export default function ServerConfigEventBusDisplay(props) {
         <ul>
           <li className="details-sublist-item">Topic URL Root : {cfg.topicURLRoot}</li>
           <li className="details-sublist-item">Producer : 
-            {cfg.configurationProperties.producer ? formatBootstrapEndpoints(cfg.configurationProperties.producer) : <i>blank</i>}</li>
+            {cfg.configurationProperties !== undefined && cfg.configurationProperties.producer ? formatBootstrapEndpoints(cfg.configurationProperties.producer) : <i>blank</i>}</li>
           <li className="details-sublist-item">Consumer : 
-            {cfg.configurationProperties.consumer ? formatBootstrapEndpoints(cfg.configurationProperties.consumer) : <i>blank</i>}</li> 
+            {cfg.configurationProperties !== undefined && cfg.configurationProperties.consumer ? formatBootstrapEndpoints(cfg.configurationProperties.consumer) : <i>blank</i>}</li> 
           <li className="details-sublist-item">Additional Properties : {cfg.additionalProperties ? formatAdditionalProperties(cfg.additionalProperties) : <i>blank</i>}</li>
         </ul>
       </div>
diff --git a/cra-client/src/components/Dino/components/details-panel/ServerConfigRepositoryServicesDisplay.js b/cra-client/src/components/Dino/components/details-panel/ServerConfigRepositoryServicesDisplay.js
index 8770bd7c..18bf3ec4 100644
--- a/cra-client/src/components/Dino/components/details-panel/ServerConfigRepositoryServicesDisplay.js
+++ b/cra-client/src/components/Dino/components/details-panel/ServerConfigRepositoryServicesDisplay.js
@@ -141,12 +141,12 @@ export default function ServerConfigRepositoryServicesDisplay(props) {
     return (
       <div>
       <div>
-        Connector Provider : {tc.connectorType.connectorProviderClassName}
+        Connector Provider : {tc !== undefined && tc.connectorType !== undefined ? tc.connectorType.connectorProviderClassName : <i>blank</i>}
       </div>
       <div>
         Embedded Connections : 
         <ul>
-          {formatEmbeddedConnections(tc.embeddedConnections)}
+          {tc !== undefined && tc.embeddedConnections !== undefined ?formatEmbeddedConnections(tc.embeddedConnections): <i>blank</i>}
         </ul>
       </div>
       </div>