Fix soft error for empty payload take 2