Catch ProtocolErrors, i.e. ShortRead in case of owserver weirdness
pylint cleanups