Handle potential empty payload