diff --git a/scripts/base/protocols/ftp/gridftp.zeek b/scripts/base/protocols/ftp/gridftp.zeek
index 14ed527c75..dc27d070d6 100644
--- a/scripts/base/protocols/ftp/gridftp.zeek
+++ b/scripts/base/protocols/ftp/gridftp.zeek
@@ -107,7 +107,8 @@ event ssl_established(c: connection) &priority=5
 
 function data_channel_initial_criteria(c: connection): bool
 	{
-	return ( c?$ssl && |c$ssl$cert_chain| > 0 && |c$ssl$client_cert_chain| > 0 &&
+	return ( c?$ssl && c$ssl?$cert_chain && c$ssl?$client_cert_chain &&
+	         |c$ssl$cert_chain| > 0 && |c$ssl$client_cert_chain| > 0 &&
 	         c$ssl?$cipher && /WITH_NULL/ in c$ssl$cipher );
 	}
 
diff --git a/testing/external/commit-hash.zeek-testing b/testing/external/commit-hash.zeek-testing
index c795769d96..f904422b93 100644
--- a/testing/external/commit-hash.zeek-testing
+++ b/testing/external/commit-hash.zeek-testing
@@ -1 +1 @@
-6981d441611732423f95f2f106034bb8f9df5377
+d3271d169e89420426010c8b16670fd148975f90
diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private
index 1ef1273329..ce0fefc7cf 100644
--- a/testing/external/commit-hash.zeek-testing-private
+++ b/testing/external/commit-hash.zeek-testing-private
@@ -1 +1 @@
-87a8b70c109b3dde01805fe95a6fba19033ccd85
+79e9cfddf16bcb717d12c3ecb7afcce2be0958ad