DELTASPIKE-263 minor improvement
DELTASPIKE-399 Added support for multi InputStream and some general clean up of how closing is handled when throwing an error.