Merge branch 'release/4.2.1'
Fixed MatchError for no error stream