Update for empty response handling