diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 654c5e0527b..072fd236fee 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -108,6 +108,7 @@ class OC_OCSClient{
 
 		$xml=@file_get_contents($url);
 		if($xml==FALSE){
+			OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
 			return NULL;
 		}
 		$data=simplexml_load_string($xml);
@@ -143,6 +144,7 @@ class OC_OCSClient{
 		$kbe=array();
 		$xml=@file_get_contents($url);
 		if($xml==FALSE){
+			OC_Log::write('core','Unable to parse knowledgebase content',OC_Log::FATAL);
 			return NULL;
 		}
 		$data=simplexml_load_string($xml);
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 4e3cdd7b908..754bf8b6376 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -9,7 +9,10 @@
 	<?php
 		$url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
 		$pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url);
-		$pageNavi->printPage();
+		if($pageNavi)
+		{
+			$pageNavi->printPage();
+		}
 	?>
 </diV>
 <?php if(is_null($_["kbe"])):?>