Make callback response handling consistent