Fix use of InvalidArgumentException
Fix issue using integer for channel identifier