diff --git a/AUTHORS b/AUTHORS
index 2d59a1b0f..9b4b8b8cc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Alexei Kozlenok
 Anatoly Bubenkoff
 Anders Hovmöller
 Andras Tim
+Andrea Cimatoribus
 Andreas Zeidler
 Andrzej Ostrowski
 Andy Freeland
diff --git a/changelog/3849.feature.rst b/changelog/3849.feature.rst
new file mode 100644
index 000000000..26cbfe7b4
--- /dev/null
+++ b/changelog/3849.feature.rst
@@ -0,0 +1 @@
+Add ``empty_parameter_set_mark=fail_at_collect`` ini option for raising an exception when parametrize collects an empty set.