diff --git a/CHANGES b/CHANGES
index 1e33825ab8..486283869a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.4-beta-42 | 2015-06-08 09:41:39 -0700
+
+  * Fix reporter errors with GridFTP traffic. (Robin Sommer)
+
 2.4-beta-40 | 2015-06-06 08:20:52 -0700
 
   * PE Analyzer: Change how we calculate the rva_table size. (Vlad Grigorescu)
diff --git a/VERSION b/VERSION
index 1a7a541df8..2b4a13c041 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4-beta-40
+2.4-beta-42
diff --git a/scripts/base/protocols/ftp/gridftp.bro b/scripts/base/protocols/ftp/gridftp.bro
index 570d13d8dc..68be66d53a 100644
--- a/scripts/base/protocols/ftp/gridftp.bro
+++ b/scripts/base/protocols/ftp/gridftp.bro
@@ -86,7 +86,7 @@ event gridftp_possibility_timeout(c: connection)
 	{
 	# only remove if we did not already detect it and the connection
 	# is not yet at its end.
-	if ( "gridftp-data" !in c$service && ! c$conn?$service )
+	if ( "gridftp-data" !in c$service && ! (c?$conn && c$conn?$service) )
 		{
 		ConnThreshold::delete_bytes_threshold(c, size_threshold, T);
 		ConnThreshold::delete_bytes_threshold(c, size_threshold, F);