diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index b5bed2667..c2515b260 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -921,7 +921,7 @@ class Context
 			{
 				return $matches[1];
 			}
-		}, $string);
+		}, strval($string));
 	}
 
 	/**
diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 970928c46..a713d964d 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -494,7 +494,7 @@ class HTMLDisplayHandler
 			{
 				$canonical_url = getFullUrl('', 'mid', $current_module_info->mid, 'page', $page);
 			}
-			elseif ($current_module_info->module_srl == $site_module_info->module_srl)
+			elseif (isset($current_module_info->module_srl) && $current_module_info->module_srl == ($site_module_info->module_srl ?? 0))
 			{
 				$canonical_url = getFullUrl('');
 			}