X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketInterpreter.cc;h=9c7e3b29837a9be57dc3679327788f9421b122e3;hb=33adfa86c0b25cb6eeda0fa12d47e077e488375a;hp=fcd67832e80af72ab642dfcc5f01e4c8c54165a6;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/PacketInterpreter.cc b/senf/Packets/PacketInterpreter.cc
index fcd6783..9c7e3b2 100644
--- a/senf/Packets/PacketInterpreter.cc
+++ b/senf/Packets/PacketInterpreter.cc
@@ -74,13 +74,18 @@ prefix_ senf::PacketInterpreterBase::ptr senf::PacketInterpreterBase::append(ptr
 
 prefix_ void senf::PacketInterpreterBase::dump(std::ostream & os)
 {
-    if (detail::AnnotationIndexerBase::maxAnnotations > 0) {
-        os << "Annotations:\n";
-        impl().dumpAnnotations(os);
+    try {
+        if (detail::AnnotationIndexerBase::maxAnnotations > 0) {
+            os << "Annotations:\n";
+            impl().dumpAnnotations(os);
+        }
+        v_dump(os);
+        for (ptr i (next()); i; i = i->next())
+            i->v_dump(os);
+    }
+    catch (senf::Exception & e) {
+        os << "[Exception: " << e.message() << "]\n";
     }
-    v_dump(os);
-    for (ptr i (next()); i; i = i->next())
-        i->v_dump(os);
 }
 
 prefix_ void senf::PacketInterpreterBase::finalizeThis()