diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 42c2539af13b77ff83999c525455cd0a60f93425..04bb21896f162beeca3b0230010d648e9c461030 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -35,6 +35,6 @@
 			</div></header>
 			<?php echo $_['content']; ?>
 		</div>
-		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'is a personal cloud which runs on your own server' ); ?>.</p></footer>
+		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'gives you the freedom to control your own data on the internet' ); ?></p></footer>
 	</body>
 </html>
diff --git a/settings/apps.php b/settings/apps.php
index e41a0cbf8dd1dee3ddefaf725a8f8f729c259fc2..05da4259768e188212107931a64f29ae2493e4cf 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -46,16 +46,19 @@ foreach($registeredApps as $app){
 	}
 }
 
-$categories=array_keys(OC_OCSClient::getCategories());
-$externalApps=OC_OCSClient::getApplications($categories);
-foreach($externalApps as $app){
-	$apps[]=array(
-		'name'=>$app['name'],
-		'id'=>$app['id'],
-		'active'=>false,
-		'description'=>$app['description'],
-		'author'=>$app['personid'],
-	);
+$catagoryNames=OC_OCSClient::getCategories();
+if(is_array($catagoryNames)){
+	$categories=array_keys($catagoryNames);
+	$externalApps=OC_OCSClient::getApplications($categories);
+	foreach($externalApps as $app){
+		$apps[]=array(
+			'name'=>$app['name'],
+			'id'=>$app['id'],
+			'active'=>false,
+			'description'=>$app['description'],
+			'author'=>$app['personid'],
+		);
+	}
 }