Fix keyerror on payload