diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.c b/src/lib-sieve/plugins/variables/ext-variables-common.c
index cf8c04f934a68076633fedb7d00c88a99a2a379f..7d8d5c29850694a5ecf5468101dcd01fb240293f 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.c
@@ -468,7 +468,7 @@ void sieve_ext_variables_set_storage
 	struct ext_variables_interpreter_context *ctx = 
 		ext_variables_interpreter_context_get(interp);
 		
-	if ( ext == NULL || storage == NULL )
+	if ( ctx == NULL || ext == NULL || storage == NULL )
 		return;
 		
 	array_idx_set(&ctx->ext_storages, (unsigned int) *ext->id, &storage);
diff --git a/tests/extensions/include/errors/action-conflicts.sieve b/tests/extensions/include/errors/action-conflicts.sieve
new file mode 100644
index 0000000000000000000000000000000000000000..ddeb42cd6c0e67c07ba8e3c35c1352a689cead31
--- /dev/null
+++ b/tests/extensions/include/errors/action-conflicts.sieve
@@ -0,0 +1,4 @@
+require "include";
+
+include "action-fileinto";
+include "action-reject";
diff --git a/tests/extensions/include/errors/included/action-fileinto.sieve b/tests/extensions/include/errors/included/action-fileinto.sieve
new file mode 100644
index 0000000000000000000000000000000000000000..9aafb95034f1d70d0c68be6fcd12d23da3f56be1
--- /dev/null
+++ b/tests/extensions/include/errors/included/action-fileinto.sieve
@@ -0,0 +1,3 @@
+require "fileinto";
+
+fileinto "frop";
diff --git a/tests/extensions/include/errors/included/action-reject.sieve b/tests/extensions/include/errors/included/action-reject.sieve
new file mode 100644
index 0000000000000000000000000000000000000000..6e7b0b0cf3e05f70c08557b34cdb2302576b89f9
--- /dev/null
+++ b/tests/extensions/include/errors/included/action-reject.sieve
@@ -0,0 +1,3 @@
+require "reject";
+
+reject "Ik heb geen zin in die rommel.";
diff --git a/tests/extensions/include/errors/runtime.sieve b/tests/extensions/include/errors/runtime.sieve
deleted file mode 100644
index fe640b049107ebc525daf2d346efb56c7eb54aaa..0000000000000000000000000000000000000000
--- a/tests/extensions/include/errors/runtime.sieve
+++ /dev/null
@@ -1,4 +0,0 @@
-require "include";
-require "variables";
-
-import "frop";