make changes to handle "None" response from server