diff --git a/scripts/base/frameworks/metrics/main.bro b/scripts/base/frameworks/metrics/main.bro
index 0d34a78f4d..f53a86a977 100644
--- a/scripts/base/frameworks/metrics/main.bro
+++ b/scripts/base/frameworks/metrics/main.bro
@@ -221,7 +221,7 @@ function add_data(id: ID, index: Index, increment: count)
 				# Don't add the data if the aggregation table doesn't include 
 				# the given host address.
 				if ( index$host !in filter$aggregation_table )
-					next;
+					return;
 				index$network = filter$aggregation_table[index$host];
 				delete index$host;
 				}
diff --git a/scripts/base/frameworks/software/main.bro b/scripts/base/frameworks/software/main.bro
index 6469f0e418..736f66af15 100644
--- a/scripts/base/frameworks/software/main.bro
+++ b/scripts/base/frameworks/software/main.bro
@@ -378,9 +378,9 @@ event software_register(id: conn_id, info: Info)
 		if ( ! info$force_log && cmp_versions(old$version, info$version) == 0 )
 			return;
 		}
+	ts[info$name] = info;
 	
 	Log::write(Software::LOG, info);
-	ts[info$name] = info;
 	}
 
 function found(id: conn_id, info: Info): bool