MP2-402 Make sure stream is disposed