diff --git a/tools/test-events.py b/tools/test-events.py
index bbbc85e..69dd2a9 100755
--- a/tools/test-events.py
+++ b/tools/test-events.py
@@ -222,11 +222,30 @@ class Field(object):


 class Message(object):
+    # * 0x8000 (BADONION): unparsable onion encrypted by sending peer
+    # * 0x4000 (PERM): permanent failure (otherwise transient)
+    # * 0x2000 (NODE): node failure (otherwise channel)
+    # * 0x1000 (UPDATE): new channel update enclosed
+    onion_types = { 'BADONION': 0x8000,
+                    'PERM':     0x4000,
+                    'NODE':     0x2000,
+                    'UPDATE':   0x1000,
+                  }
     def __init__(self, name, value):
         self.name = name
-        self.value = int(value)
+        self.value = self.parse_value(value)
         self.fields = []

+    def parse_value(self, value):
+        result = 0
+        for token in value.split('|'):
+            if token in self.onion_types.keys():
+                result |= self.onion_types[token]
+            else:
+                result |= int(token)
+
+        return result
+
     def findField(self, fieldname):
         for f in self.fields:
             if f.name == fieldname: