Check for entry stream null.
Fix change from previous pull request