diff --git a/lib/src/session.dart b/lib/src/session.dart
index a7e98d6..9506665 100644
--- a/lib/src/session.dart
+++ b/lib/src/session.dart
@@ -62,6 +62,8 @@ class WAMPSession {
       var data = _serializer.serialize(msg);
       _invocationRequests.remove(msg.requestID);
       return data;
+    } else if (msg is Goodbye) {
+      return _serializer.serialize(msg);
     }
     throw ProtocolError("unknown message ${msg.runtimeType}");
   }
@@ -195,6 +197,8 @@ class WAMPSession {
           throw ProtocolError("unknown error message type ${msg.runtimeType}");
       }
 
+      return msg;
+    } else if (msg is Goodbye) {
       return msg;
     }
 
diff --git a/lib/uris.dart b/lib/uris.dart
new file mode 100644
index 0000000..e8223af
--- /dev/null
+++ b/lib/uris.dart
@@ -0,0 +1 @@
+export "src/uris.dart";