diff --git a/src/GSvarServer/ServerController.cpp b/src/GSvarServer/ServerController.cpp
index 769aa8a6b..d3c5ce2f1 100644
--- a/src/GSvarServer/ServerController.cpp
+++ b/src/GSvarServer/ServerController.cpp
@@ -289,7 +289,7 @@ HttpResponse ServerController::locateFileByType(const HttpRequest& request)
     ServerDB db = ServerDB();
     if (db.hasFileLocation(found_file, request.getUrlParams()["type"].toUpper().trimmed(), locus, multiple_files, return_if_missing))
     {
-        QJsonDocument updated_cached_doc;
+
         QJsonArray updated_cached_array;
 
         QJsonDocument cache_doc = db.getFileLocation(found_file, request.getUrlParams()["type"].toUpper().trimmed(), locus, multiple_files, return_if_missing);
@@ -297,10 +297,12 @@ HttpResponse ServerController::locateFileByType(const HttpRequest& request)
 
         QJsonArray cached_array = cache_doc.array();
         Log::error("cached_array.size() " + QString::number(cached_array.size()));
-        for (int index = 0; index < cached_array.size(); index++)
+        for (int index = 0; index < cached_array.count(); ++index)
         {
+            Log::error(QString::number(index));
             if (cached_array.at(index).isObject())
             {
+                Log::error(QString::number(index) + " is object");
                 QJsonObject cached_object = cached_array.takeAt(index).toObject();
                 QString cached_filename = cached_object["filename"].toString();
                 Log::error("cached_filename = " + cached_filename);
@@ -316,6 +318,7 @@ HttpResponse ServerController::locateFileByType(const HttpRequest& request)
         // Ignore the cache entry, if no URLs were genereated
         if (updated_cached_array.size()>0)
         {
+            QJsonDocument updated_cached_doc;
             updated_cached_doc.setArray(updated_cached_array);
 
             BasicResponseData response_data;