Close file streams on exceptions
Comments added to connection manager