fixed error message expectation
performance optimisations (only visible if many requests go over one connection)