diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 6c1f5ba694..4277726624 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -32,7 +32,6 @@
 namespace OC\App;
 
 use OCP\App\AppPathNotFoundException;
-use OC_App;
 use OCP\App\IAppManager;
 use OCP\App\ManagerEvent;
 use OCP\IAppConfig;
@@ -211,12 +210,12 @@ class AppManager implements IAppManager {
 	 * Enable an app for every user
 	 *
 	 * @param string $appId
-	 * @throws \Exception
+	 * @throws AppPathNotFoundException
 	 */
 	public function enableApp($appId) {
-		if(OC_App::getAppPath($appId) === false) {
-			throw new \Exception("$appId can't be enabled since it is not installed.");
-		}
+		// Check if app exists
+		$this->getAppPath($appId);
+
 		$this->installedAppsCache[$appId] = 'yes';
 		$this->appConfig->setValue($appId, 'enabled', 'yes');
 		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE, new ManagerEvent(
diff --git a/lib/public/App/IAppManager.php b/lib/public/App/IAppManager.php
index 72c9977712..107297bc89 100644
--- a/lib/public/App/IAppManager.php
+++ b/lib/public/App/IAppManager.php
@@ -57,6 +57,7 @@ interface IAppManager {
 	 * Enable an app for every user
 	 *
 	 * @param string $appId
+	 * @throws AppPathNotFoundException
 	 * @since 8.0.0
 	 */
 	public function enableApp($appId);
diff --git a/tests/lib/App/ManagerTest.php b/tests/lib/App/ManagerTest.php
index 8b23168938..59ef9a36bf 100644
--- a/tests/lib/App/ManagerTest.php
+++ b/tests/lib/App/ManagerTest.php
@@ -134,10 +134,11 @@ class ManagerTest extends TestCase {
 		try {
 			$this->manager->enableApp('some_random_name_which_i_hope_is_not_an_app');
 			$this->assertFalse(true, 'If this line is reached the expected exception is not thrown.');
-		} catch (\Exception $e) {
-			// excpetion is expected
-			$this->assertEquals("some_random_name_which_i_hope_is_not_an_app can't be enabled since it is not installed.", $e->getMessage());
+		} catch (AppPathNotFoundException $e) {
+			// Exception is expected
+			$this->assertEquals('Could not find path for some_random_name_which_i_hope_is_not_an_app', $e->getMessage());
 		}
+
 		$this->assertEquals('no', $this->appConfig->getValue(
 			'some_random_name_which_i_hope_is_not_an_app', 'enabled', 'no'
 		));