Merge "Fix error code returned from sim close channel"