diff --git a/fabric-client/lib/CertificateAuthority.js b/fabric-client/lib/CertificateAuthority.js
index 3f48b3a152..7ee9b1c583 100644
--- a/fabric-client/lib/CertificateAuthority.js
+++ b/fabric-client/lib/CertificateAuthority.js
@@ -53,7 +53,7 @@ var CertificateAuthority = class {
 		}
 		this._url = url;
 		this._connection_options = connection_options;
-		this._tlsCACerts = tlsCACerts;;
+		this._tlsCACerts = tlsCACerts;
 		this._registrar = registrar;
 	}
 
diff --git a/fabric-client/lib/Client.js b/fabric-client/lib/Client.js
index 5d6fe8c6a1..a883a30b85 100644
--- a/fabric-client/lib/Client.js
+++ b/fabric-client/lib/Client.js
@@ -368,9 +368,20 @@ var Client = class extends BaseClient {
 				 let cas = organization_config.getCertificateAuthorities();
 				 if(cas.length > 0) {
 					 let ca = cas[0];
+					 let tlsCACerts = ca.getTlsCACerts();
+					 if(tlsCACerts) {
+						 tlsCACerts = [tlsCACerts];
+					 } else {
+						 tlsCACerts = [];
+					 }
+					 let connection_options = ca.getConnectionOptions();
+					 let verify = true; //default if not found
+					 if(connection_options && typeof connection_options.verify === 'boolean') {
+						 verify = connection_options.verify
+					 }
 					 tls_options = {
-						 trustedRoots: [ca.getTlsCACerts()], //TODO handle non existent
-						 verify: ca.getConnectionOptions().verify //TODO handle non existent
+						 trustedRoots: tlsCACerts,
+						 verify: verify
 					 };
 					 ca_url = ca.getUrl();
 					 ca_name = ca.getCaName();
diff --git a/test/unit/network-config.js b/test/unit/network-config.js
index ff9d3b45ae..6a160343c8 100644
--- a/test/unit/network-config.js
+++ b/test/unit/network-config.js
@@ -155,6 +155,10 @@ test('\n\n ** configuration testing **\n\n', function (t) {
 			let eventHub = client._network_config.getEventHub('peer0.org1.example.com');
 			t.equals(eventHub._ep._options['request-timeout'],3000, ' check that we get this eventHub timeout set');
 
+			delete client._network_config._network_config.certificateAuthorities['ca-org1'].tlsCACerts;
+			delete client._network_config._network_config.certificateAuthorities['ca-org1'].httpOptions;
+			let certificate_authority = client.getCertificateAuthority();
+
 		},
 		null,
 		'2 Should be able to run a number of test without error'