diff --git a/components/com_finder/router.php b/components/com_finder/router.php
index 3dc4d50875786..4e9fb54aeb15c 100644
--- a/components/com_finder/router.php
+++ b/components/com_finder/router.php
@@ -52,19 +52,19 @@ public function build(&$query)
 			$item = $this->menu->getItem($query['Itemid']);
 
 			// Check if the view matches.
-			if ($item && @$item->query['view'] === @$query['view'])
+			if ($item && isset($item->query['view']) && isset($query['view']) && $item->query['view'] === $query['view'])
 			{
 				unset($query['view']);
 			}
 
 			// Check if the search query filter matches.
-			if ($item && @$item->query['f'] === @$query['f'])
+			if ($item && isset($item->query['f']) && isset($query['f']) && $item->query['f'] === $query['f'])
 			{
 				unset($query['f']);
 			}
 
 			// Check if the search query string matches.
-			if ($item && @$item->query['q'] === @$query['q'])
+			if ($item && isset($item->query['q']) && isset($query['q']) && $item->query['q'] === $query['q'])
 			{
 				unset($query['q']);
 			}
@@ -114,7 +114,7 @@ public function parse(&$segments)
 		}
 
 		// Check if the view segment is set and it equals search or advanced.
-		if (@$segments[0] === 'search' || @$segments[0] === 'advanced')
+		if (isset($segments[0]) && ($segments[0] === 'search' || $segments[0] === 'advanced'))
 		{
 			$vars['view'] = $segments[0];
 		}