diff --git a/server/src/main/java/org/openintegrationengine/tlsmanager/server/CertificateService.java b/server/src/main/java/org/openintegrationengine/tlsmanager/server/CertificateService.java
index a089ecb..315687f 100644
--- a/server/src/main/java/org/openintegrationengine/tlsmanager/server/CertificateService.java
+++ b/server/src/main/java/org/openintegrationengine/tlsmanager/server/CertificateService.java
@@ -10,6 +10,7 @@
 import com.mirth.connect.connectors.tcp.TcpDispatcherProperties;
 import com.mirth.connect.connectors.ws.WebServiceDispatcherProperties;
 import com.mirth.connect.donkey.model.channel.ConnectorPluginProperties;
+import com.mirth.connect.donkey.model.channel.ConnectorProperties;
 import com.mirth.connect.model.Channel;
 import com.mirth.connect.model.Connector;
 import com.mirth.connect.server.controllers.ChannelController;
@@ -277,27 +278,35 @@ private Set<String> getChannelsInUse(String alias) {
         };
 
         for (Channel channel : channels) {
-            Set<ConnectorPluginProperties> sourceProperties = channel.getSourceConnector().getProperties().getPluginProperties();
+            ConnectorProperties connectorProperties = channel.getSourceConnector().getProperties();
 
-            if (sourceProperties != null && !sourceProperties.isEmpty()) {
-                TLSConnectorProperties tlsSourceProperties = (TLSConnectorProperties) sourceProperties
-                    .stream()
-                    .filter(props -> props instanceof TLSConnectorProperties)
-                    .findFirst()
-                    .orElse(null);
+            if (connectorProperties != null) {
+                Set<ConnectorPluginProperties> sourceProperties = connectorProperties.getPluginProperties();
 
-                addIfInUse.accept(tlsSourceProperties, channel.getName());
+                if (sourceProperties != null && !sourceProperties.isEmpty()) {
+                    TLSConnectorProperties tlsSourceProperties = (TLSConnectorProperties) sourceProperties
+                        .stream()
+                        .filter(props -> props instanceof TLSConnectorProperties)
+                        .findFirst()
+                        .orElse(null);
+
+                    addIfInUse.accept(tlsSourceProperties, channel.getName());
+                }
             }
             for (Connector destinationConnector : channel.getDestinationConnectors()) {
-                Set<ConnectorPluginProperties> destinationProperties = destinationConnector.getProperties().getPluginProperties();
+                ConnectorProperties destinationConnectorProperties = destinationConnector.getProperties();
 
-                TLSConnectorProperties tlsDestinationProperties = (TLSConnectorProperties) destinationProperties
-                    .stream()
-                    .filter(props -> props instanceof TLSConnectorProperties)
-                    .findFirst()
-                    .orElse(null);
+                if (connectorProperties != null) {
+                    Set<ConnectorPluginProperties> destinationProperties = destinationConnectorProperties.getPluginProperties();
 
-                addIfInUse.accept(tlsDestinationProperties, channel.getName());
+                    TLSConnectorProperties tlsDestinationProperties = (TLSConnectorProperties) destinationProperties
+                        .stream()
+                        .filter(props -> props instanceof TLSConnectorProperties)
+                        .findFirst()
+                        .orElse(null);
+
+                    addIfInUse.accept(tlsDestinationProperties, channel.getName());
+                }
             }
         }
         return channelsInUse;