Yep, testing for the payload type may be a good idea