diff --git a/retriever/retriever.php b/retriever/retriever.php
index ef00bd33..9dbe6170 100644
--- a/retriever/retriever.php
+++ b/retriever/retriever.php
@@ -830,7 +830,7 @@ function retriever_content($a) {
 		$a->page['content'] .= "<p>Please log in</p>";
 		return;
 	}
-	if ($a->argv[1] === 'help') {
+	if (isset(DI::args()->getArgv()[1]) and DI::args()->getArgv()[1] === 'help') {
 		$feeds = DBA::selectToArray('contact', ['id', 'name', 'thumb'], ['uid' => local_user(), 'network' => 'feed']);
 		for ($i = 0; $i < count($feeds); ++$i) {
 			$feeds[$i]['url'] = DI::baseUrl()->get(true) . '/retriever/' . $feeds[$i]['id'];
@@ -842,14 +842,15 @@ function retriever_content($a) {
 								       '$feeds' => $feeds));
 		return;
 	}
-	if ($a->argv[1]) {
-		$retriever_rule = get_retriever_rule($a->argv[1], local_user(), false);
+	if (isset(DI::args()->getArgv()[1])) {
+		$arg1 = DI::args()->getArgv()[1]
+		$retriever_rule = get_retriever_rule($arg1, local_user(), false);
 		if (!$retriever_rule) {
-		    $retriever_rule = ['id' => 0, 'data' => ['enable' => 0, 'modurl' => '', 'pattern' => '', 'replace' => '', 'images' => 0, 'storecookies' => 0, 'cookiedata' => '', 'customxslt' => '', 'include' => '', 'exclude' => '']];
+			$retriever_rule = ['id' => 0, 'data' => ['enable' => 0, 'modurl' => '', 'pattern' => '', 'replace' => '', 'images' => 0, 'storecookies' => 0, 'cookiedata' => '', 'customxslt' => '', 'include' => '', 'exclude' => '']];
 		}
 
 		if (!empty($_POST["id"])) {
-			$retriever_rule = get_retriever_rule($a->argv[1], local_user(), true);
+			$retriever_rule = get_retriever_rule($arg1, local_user(), true);
 			$retriever_rule['data'] = array();
 			foreach (array('modurl', 'pattern', 'replace', 'enable', 'images', 'customxslt', 'storecookies', 'cookiedata') as $setting) {
 				if (empty($_POST['retriever_' . $setting])) {