diff --git a/tests/acceptance/features/bootstrap/ShareesContext.php b/tests/acceptance/features/bootstrap/ShareesContext.php
index 6af98cadff48..50dbe66211a3 100644
--- a/tests/acceptance/features/bootstrap/ShareesContext.php
+++ b/tests/acceptance/features/bootstrap/ShareesContext.php
@@ -148,6 +148,12 @@ public function getArrayOfShareesResponded(
 			$shareeType = \substr($shareeType, 6);
 		}
 
+		Assert::assertArrayHasKey(
+			$shareeType,
+			$elements,
+			__METHOD__ . " The sharees response does not have key '$shareeType'"
+		);
+
 		$sharees = [];
 		foreach ($elements[$shareeType] as $element) {
 			if (\is_int(\key($element))) {
diff --git a/tests/acceptance/features/bootstrap/TrashbinContext.php b/tests/acceptance/features/bootstrap/TrashbinContext.php
index 70cbd8bc5cd7..f14f630ad12c 100644
--- a/tests/acceptance/features/bootstrap/TrashbinContext.php
+++ b/tests/acceptance/features/bootstrap/TrashbinContext.php
@@ -435,7 +435,7 @@ public function asFileOrFolderExistsInTrash($user, $path) {
 
 		Assert::assertNotNull(
 			$firstEntry,
-			"The first trash entry is found null unexpectedly"
+			"The first trash entry was not found while looking for trashbin entry '$path' of user '$user'"
 		);
 
 		if (\count($sections) !== 1) {