Better tracing and exception handling
Merge branch 'master' of github.com:google/ChannelPlate