correct the skip logic for channel Error exception

Change-Id: I134b8283acbbb2f8f90927a91d213e369a37262b
Merge "correct the skip logic for channel Error exception"