diff --git a/.github/badges/tests.svg b/.github/badges/tests.svg
index 1defd0b51..390300b87 100644
--- a/.github/badges/tests.svg
+++ b/.github/badges/tests.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="134.89999999999998" height="20"><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="round"><rect width="134.89999999999998" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#round)"><rect width="36.8" height="20" fill="#555"/><rect x="36.8" width="98.1" height="20" fill="#dfb317"/><rect width="134.89999999999998" height="20" fill="url(#smooth)"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"><text x="194.0" y="150" fill="#010101" fill-opacity=".3" transform="scale(0.1)" textLength="268.0" lengthAdjust="spacing">tests</text><text x="194.0" y="140" transform="scale(0.1)" textLength="268.0" lengthAdjust="spacing">tests</text><text x="848.5" y="150" fill="#010101" fill-opacity=".3" transform="scale(0.1)" textLength="881.0" lengthAdjust="spacing">377/381 passed</text><text x="848.5" y="140" transform="scale(0.1)" textLength="881.0" lengthAdjust="spacing">377/381 passed</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="110.2" height="20"><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="round"><rect width="110.2" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#round)"><rect width="36.8" height="20" fill="#555"/><rect x="36.8" width="73.4" height="20" fill="#97CA00"/><rect width="110.2" height="20" fill="url(#smooth)"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"><text x="194.0" y="150" fill="#010101" fill-opacity=".3" transform="scale(0.1)" textLength="268.0" lengthAdjust="spacing">tests</text><text x="194.0" y="140" transform="scale(0.1)" textLength="268.0" lengthAdjust="spacing">tests</text><text x="725.0" y="150" fill="#010101" fill-opacity=".3" transform="scale(0.1)" textLength="634.0" lengthAdjust="spacing">381 passed</text><text x="725.0" y="140" transform="scale(0.1)" textLength="634.0" lengthAdjust="spacing">381 passed</text></g></svg>
\ No newline at end of file
diff --git a/src/ndi/+ndi/+cloud/+api/+implementation/+documents/ListDatasetDocuments.m b/src/ndi/+ndi/+cloud/+api/+implementation/+documents/ListDatasetDocuments.m
index 7a3d4e073..01535268e 100644
--- a/src/ndi/+ndi/+cloud/+api/+implementation/+documents/ListDatasetDocuments.m
+++ b/src/ndi/+ndi/+cloud/+api/+implementation/+documents/ListDatasetDocuments.m
@@ -50,6 +50,9 @@
             if (apiResponse.StatusCode == 200)
                 b = true;
                 answer = apiResponse.Body.Data;
+                if isfield(answer, 'documents') && isempty(answer.documents) && ~iscell(answer.documents)
+                    answer.documents = {};
+                end
             else
                 if isprop(apiResponse.Body, 'Data')
                     answer = apiResponse.Body.Data;
diff --git a/src/ndi/+ndi/+cloud/+api/+implementation/+documents/ListDatasetDocumentsAll.m b/src/ndi/+ndi/+cloud/+api/+implementation/+documents/ListDatasetDocumentsAll.m
index 4ba4aa6b7..df9a549f6 100644
--- a/src/ndi/+ndi/+cloud/+api/+implementation/+documents/ListDatasetDocumentsAll.m
+++ b/src/ndi/+ndi/+cloud/+api/+implementation/+documents/ListDatasetDocumentsAll.m
@@ -79,6 +79,9 @@
                     break; % Exit the main page loop
                 end
             end
+            if isfield(answer, 'documents') && isempty(answer.documents) && ~iscell(answer.documents)
+                answer.documents = {};
+            end
         end
     end
 end
diff --git a/tests/+ndi/+unittest/+cloud/DocumentsTest.m b/tests/+ndi/+unittest/+cloud/DocumentsTest.m
index 9267ad1d5..72a60dd35 100644
--- a/tests/+ndi/+unittest/+cloud/DocumentsTest.m
+++ b/tests/+ndi/+unittest/+cloud/DocumentsTest.m
@@ -304,7 +304,7 @@ function testBulkUploadAndDownload(testCase)
                 narrative(end+1) = "Bulk upload API call failed with an error: " + ME.message;
             end
             
-            msg_upload = "Bulk upload verification failed. Report: " + jsonencode(report_upload);
+            msg_upload = ndi.unittest.cloud.APIMessage(narrative, b_upload, report_upload, [], []);
             testCase.verifyTrue(b_upload, msg_upload);
             narrative(end+1) = "Bulk upload successful.";