diff --git a/repos/os/include/os/session_requester.h b/repos/os/include/os/session_requester.h
index 5b44bcd319..cf137ac6c0 100644
--- a/repos/os/include/os/session_requester.h
+++ b/repos/os/include/os/session_requester.h
@@ -35,9 +35,13 @@ class Genode::Session_requester
 
 			void produce_content(char *dst, Genode::size_t dst_len) override
 			{
-				Xml_generator xml(dst, dst_len, "session_requests", [&] () {
-					_id_space.for_each<Session_state const>([&] (Session_state const &s) {
-						s.generate_session_request(xml); }); });
+				try {
+					Xml_generator xml(dst, dst_len, "session_requests", [&] () {
+						_id_space.for_each<Session_state const>([&] (Session_state const &s) {
+							s.generate_session_request(xml); }); });
+				} catch (Xml_generator::Buffer_exceeded &) {
+					throw Buffer_capacity_exceeded();
+				}
 			}
 		} _content_producer { _id_space };