Clear out PMA's error handler

And some small changes to payloads.