Added protobuf exception handling statement
Merge branch 'master' of https://github.com/johngergely/conductor

Conflicts:
	read_stream.py