diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 06d03f2ec7..57ba39d41f 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -1090,7 +1090,7 @@ class Manager implements IManager {
 		}
 
 		if ($share === null) {
-			throw new ShareNotFound();
+			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
 		}
 
 		$this->checkExpireDate($share);
@@ -1110,7 +1110,7 @@ class Manager implements IManager {
 		if ($share->getExpirationDate() !== null &&
 			$share->getExpirationDate() <= new \DateTime()) {
 			$this->deleteShare($share);
-			throw new ShareNotFound();
+			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
 		}
 
 	}
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index 13556285b6..79af2f60ce 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -2142,6 +2142,7 @@ class ManagerTest extends \Test\TestCase {
 
 	/**
 	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
+	 * @expectedExceptionMessage The requested share does not exist anymore
 	 */
 	public function testGetShareByTokenExpired() {
 		$this->config
@@ -2150,6 +2151,10 @@ class ManagerTest extends \Test\TestCase {
 			->with('core', 'shareapi_allow_links', 'yes')
 			->willReturn('yes');
 
+		$this->l->expects($this->once())
+			->method('t')
+			->willReturnArgument(0);
+
 		$manager = $this->createManagerMock()
 			->setMethods(['deleteShare'])
 			->getMock();