diff --git a/.htaccess b/.htaccess
index 11ee1d59f83a69f61788b8da5b3504e006543972..6d1844dbf9ca5f97499b68a51a32641c9c39062e 100755
--- a/.htaccess
+++ b/.htaccess
@@ -1,8 +1,8 @@
 ErrorDocument 403 /core/templates/403.php
 ErrorDocument 404 /core/templates/404.php
 <IfModule mod_php5.c>
-php_value upload_max_filesize 513M
-php_value post_max_size 513M
+php_value upload_max_filesize 2000M
+php_value post_max_size 2000M
 php_value memory_limit 512M
 <IfModule env_module>
   SetEnv htaccessWorking true
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 097ff3c0162a9a725305f0576b30b40351375efe..32dd26ae6c3d90aefa60a767eaca68f321bc7695 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -36,8 +36,10 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 			$this->root.='/';
 		}
 		
-		$caview = \OCP\Files::getStorage('files_external');
-		$capath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("");
+		$capath = '';
+		if($caview = \OCP\Files::getStorage('files_external')) {
+			$capath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("");
+		}
 		$settings = array(
 			'baseUri' => $this->createBaseUri(),
 			'userName' => $this->user,