diff --git a/AwqatSalaat/DataModel/IslamicFinderApi/Client.cs b/AwqatSalaat/DataModel/IslamicFinderApi/Client.cs
index d54e618..1280738 100644
--- a/AwqatSalaat/DataModel/IslamicFinderApi/Client.cs
+++ b/AwqatSalaat/DataModel/IslamicFinderApi/Client.cs
@@ -49,6 +49,10 @@ private static async Task<T> GetDataAsync<T>(Request request) where T : Response
                 if (httpResponse.IsSuccessStatusCode)
                 {
                     string responseBody = await httpResponse.Content.ReadAsStringAsync();
+                    if (string.IsNullOrEmpty(responseBody))
+                    {
+                        throw new IslamicFinderApiException("Islamic Finder service did not respond with data.");
+                    }
                     T apiResponse = JsonConvert.DeserializeObject<T>(responseBody);
                     if (!apiResponse.Success)
                     {