diff --git a/lib/templating/kt3template.inc.php b/lib/templating/kt3template.inc.php
index 1b9ffd8..741524a 100644
--- a/lib/templating/kt3template.inc.php
+++ b/lib/templating/kt3template.inc.php
@@ -385,9 +385,13 @@ class KTPage {
     }
 
     function getDisclaimer() {
-	$oRegistry =& KTPluginRegistry::getSingleton();
-	$oPlugin =& $oRegistry->getPlugin('ktstandard.disclaimers.plugin');
-	return $oPlugin->getPageDisclaimer();
+        $oRegistry =& KTPluginRegistry::getSingleton();
+        $oPlugin =& $oRegistry->getPlugin('ktstandard.disclaimers.plugin');
+        if (!PEAR::isError($oPlugin) && !is_null($oPlugin)) {
+            return $oPlugin->getPageDisclaimer();
+        } else {
+            return;
+        }
     }
 	
 }
diff --git a/login.php b/login.php
index e956c1f..4404a17 100644
--- a/login.php
+++ b/login.php
@@ -81,10 +81,12 @@ class LoginPageDispatcher extends KTDispatcher {
         }
         $sLanguageSelect = $default->defaultLanguage;
 
-	// extra disclaimer, if plugin is enabled
-	$oRegistry =& KTPluginRegistry::getSingleton();
-	$oPlugin =& $oRegistry->getPlugin('ktstandard.disclaimers.plugin');
-	$sDisclaimer = $oPlugin->getLoginDisclaimer();
+        // extra disclaimer, if plugin is enabled
+        $oRegistry =& KTPluginRegistry::getSingleton();
+        $oPlugin =& $oRegistry->getPlugin('ktstandard.disclaimers.plugin');
+        if (!PEAR::isError($oPlugin) && !is_null($oPlugin)) {
+            $sDisclaimer = $oPlugin->getLoginDisclaimer();
+        }
 
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate = $oTemplating->loadTemplate("ktcore/login");