fix cs
fix exception handling in Protocol
small cs tweaks