diff --git a/aux/binpac b/aux/binpac
index 3a4684801a..b1031e97e1 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 3a4684801aafa0558383199e9abd711650b53af9
+Subproject commit b1031e97e1cb57df0e0405a6b5c6d0eb49c32c62
diff --git a/aux/bro-aux b/aux/bro-aux
index 9ea20c3905..92dea34b43 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 9ea20c3905bd3fd5109849c474a2f2b4ed008357
+Subproject commit 92dea34b43f4109b97dc2cccda49dbb58c72f77a
diff --git a/aux/broccoli b/aux/broccoli
index 33d0ed4a54..64134bc778 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 33d0ed4a54a6ecf08a0b5fe18831aa413b437066
+Subproject commit 64134bc778b46307180192cff48f0d1f08a874e8
diff --git a/aux/broctl b/aux/broctl
index 2f808bc854..db3f7e375b 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 2f808bc8541378b1a4953cca02c58c43945d154f
+Subproject commit db3f7e375b785ee3ef9795bc4917d396871785ff
diff --git a/cmake b/cmake
index 03de0cc467..0b22aeb9f3 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 03de0cc467d2334dcb851eddd843d59fef217909
+Subproject commit 0b22aeb9f30b1edad54c225ef3e431c68750480b
diff --git a/src/main.cc b/src/main.cc
index 73f7119e7a..63949c5093 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -853,9 +853,17 @@ int main(int argc, char** argv)
 	file_mgr->InitPreScript();
 	broxygen_mgr->InitPreScript();
 
+	bool missing_plugin = false;
+
 	for ( set<string>::const_iterator i = requested_plugins.begin();
 	      i != requested_plugins.end(); i++ )
-		plugin_mgr->ActivateDynamicPlugin(*i);
+		{
+		if ( ! plugin_mgr->ActivateDynamicPlugin(*i) )
+			missing_plugin = true;
+		}
+
+	if ( missing_plugin )
+		reporter->FatalError("Failed to activate requested dynamic plugin(s).");
 
 	plugin_mgr->ActivateDynamicPlugins(! bare_mode);
 
diff --git a/testing/scripts/has-writer b/testing/scripts/has-writer
index 4c5f38a6bb..d6cdf28d12 100755
--- a/testing/scripts/has-writer
+++ b/testing/scripts/has-writer
@@ -3,4 +3,4 @@
 # Returns true if Bro has been compiled with support for writer type
 # $1. The type name must match the plugin name that "bro -N" prints.
 
-bro -N $1 >/dev/null
+bro -N | grep -q $1 >/dev/null