Improved benign error handling
Merge branch 'master' of github.com:SlyMarbo/spdy