Add TODO note for exception on payload handling