diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index af846b9283..6f2efe167d 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -979,7 +979,7 @@ class Manager implements IManager {
 		try {
 			$share = $provider->getShareByToken($token);
 		} catch (ShareNotFound $e) {
-			//Ignore
+			$share = null;
 		}
 
 		// If it is not a link share try to fetch a federated share by token
diff --git a/tests/lib/share20/managertest.php b/tests/lib/share20/managertest.php
index d173f86f09..197fa87438 100644
--- a/tests/lib/share20/managertest.php
+++ b/tests/lib/share20/managertest.php
@@ -2042,6 +2042,46 @@ class ManagerTest extends \Test\TestCase {
 		$this->assertSame($share, $ret);
 	}
 
+	public function testGetShareByTokenWithException() {
+		$factory = $this->getMock('\OCP\Share\IProviderFactory');
+
+		$manager = new Manager(
+			$this->logger,
+			$this->config,
+			$this->secureRandom,
+			$this->hasher,
+			$this->mountManager,
+			$this->groupManager,
+			$this->l,
+			$factory,
+			$this->userManager,
+			$this->rootFolder
+		);
+
+		$share = $this->getMock('\OCP\Share\IShare');
+
+		$factory->expects($this->at(0))
+			->method('getProviderForType')
+			->with(\OCP\Share::SHARE_TYPE_LINK)
+			->willReturn($this->defaultProvider);
+		$factory->expects($this->at(1))
+			->method('getProviderForType')
+			->with(\OCP\Share::SHARE_TYPE_REMOTE)
+			->willReturn($this->defaultProvider);
+
+		$this->defaultProvider->expects($this->at(0))
+			->method('getShareByToken')
+			->with('token')
+			->will($this->throwException(new ShareNotFound()));
+		$this->defaultProvider->expects($this->at(1))
+			->method('getShareByToken')
+			->with('token')
+			->willReturn($share);
+
+		$ret = $manager->getShareByToken('token');
+		$this->assertSame($share, $ret);
+	}
+
 	/**
 	 * @expectedException \OCP\Share\Exceptions\ShareNotFound
 	 */