diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 9ee509bb13..4c0ec9617f 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -71,7 +71,7 @@ class Scanner {
 		\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
 		$data = $this->getData($file);
 		if ($data) {
-			if ($file !== '') {
+			if ($file) {
 				$parent = dirname($file);
 				if ($parent === '.') {
 					$parent = '';
@@ -101,7 +101,7 @@ class Scanner {
 		if ($dh = $this->storage->opendir($path)) {
 			while ($file = readdir($dh)) {
 				if ($file !== '.' and $file !== '..') {
-					$child = ($path !== '') ? $path . '/' . $file : $file;
+					$child = ($path) ? $path . '/' . $file : $file;
 					$data = $this->scanFile($child);
 					if ($data) {
 						if ($data['mimetype'] === 'httpd/unix-directory') {
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 4e3eb1989b..724c83b361 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -143,8 +143,8 @@ class Filesystem {
 	 * @return string
 	 */
 	static public function getMountPoint($path) {
-		\OC_Hook::emit(self::CLASSNAME, 'get_mountpoint', array('path' => $path));
 		$path = self::normalizePath($path) . '/';
+		\OC_Hook::emit(self::CLASSNAME, 'get_mountpoint', array('path' => $path));
 		$foundMountPoint = '';
 		$mountPoints = array_keys(self::$mounts);
 		foreach ($mountPoints as $mountpoint) {
@@ -205,7 +205,7 @@ class Filesystem {
 		$mountpoint = self::getMountPoint($path);
 		if ($mountpoint) {
 			$storage = self::getStorage($mountpoint);
-			if ($mountpoint === $path) {
+			if ($mountpoint === $path or $mountpoint . '/' === $path) {
 				$internalPath = '';
 			} else {
 				$internalPath = substr($path, strlen($mountpoint));