diff --git a/auth/shibboleth/index.php b/auth/shibboleth/index.php
index 7961af7b3af..22d46f474a5 100644
--- a/auth/shibboleth/index.php
+++ b/auth/shibboleth/index.php
@@ -66,7 +66,7 @@
             }
 
             /// Go to my-moodle page instead of homepage if mymoodleredirect enabled
-            if (!has_capability('moodle/site:config',get_context_instance(CONTEXT_SYSTEM)) and !empty($CFG->mymoodleredirect) and !isguest()) {
+            if (!has_capability('moodle/site:config',get_context_instance(CONTEXT_SYSTEM)) and !empty($CFG->mymoodleredirect) and !isguestuser()) {
                 if ($urltogo == $CFG->wwwroot or $urltogo == $CFG->wwwroot.'/' or $urltogo == $CFG->wwwroot.'/index.php') {
                     $urltogo = $CFG->wwwroot.'/my/';
                 }
diff --git a/auth/shibboleth/login.php b/auth/shibboleth/login.php
index 107ce249c75..8be9f9ef366 100644
--- a/auth/shibboleth/login.php
+++ b/auth/shibboleth/login.php
@@ -20,7 +20,7 @@ httpsrequired();
 
 /// Define variables used in page
     if (!$site = get_site()) {
-        error("No site found!");
+        print_error('nosite');
     }
 
     if (empty($CFG->langmenu)) {