diff --git a/components/debug.rst b/components/debug.rst
index e42e3d3423a..59d9049037b 100644
--- a/components/debug.rst
+++ b/components/debug.rst
@@ -41,8 +41,9 @@ tools.
 
 .. caution::
 
-    You should never enable the debug tools in a production environment as
-    they might disclose sensitive information to the user.
+    Apart from the error handler, you should never enable the debug
+    tools in a production environment as they might disclose sensitive
+    information to the user.
 
 Enabling the Error Handler
 --------------------------
@@ -56,6 +57,12 @@ fatal errors)::
 
     ErrorHandler::register();
 
+.. note::
+
+    This one is fine to use in a production environment and will be
+    enabled if you use the framework bundle, so that you get better
+    logging.
+
 Enabling the Exception Handler
 ------------------------------