handle corrupted payloads better...