Fix TFS #1072365 by handling the case where we get a 404 response from the Data Client