diff --git a/composer.json b/composer.json
index 98bb9f7..d449c87 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
 		"mediawiki/mediawiki-codesniffer": "28.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
 		"mediawiki/minus-x": "0.3.2",
-		"mediawiki/mediawiki-phan-config": "0.8.0"
+		"mediawiki/mediawiki-phan-config": "0.9.0"
 	},
 	"scripts": {
 		"fix": [
diff --git a/includes/VectorTemplate.php b/includes/VectorTemplate.php
index 619a20f..b9d3339 100644
--- a/includes/VectorTemplate.php
+++ b/includes/VectorTemplate.php
@@ -302,6 +302,9 @@ class VectorTemplate extends BaseTemplate {
 			$this->config->get( 'VectorUseIconWatch' )
 			&& ( $key === 'watch' || $key === 'unwatch' )
 		) {
+			if ( !isset( $item['class'] ) ) {
+				$item['class'] = '';
+			}
 			$item['class'] = rtrim( 'icon ' . $item['class'], ' ' );
 			$item['primary'] = true;
 		}
@@ -309,6 +312,9 @@ class VectorTemplate extends BaseTemplate {
 		// Add CSS class 'collapsible' to links which are not marked as "primary"
 		if (
 			isset( $options['vector-collapsible'] ) && $options['vector-collapsible'] ) {
+			if ( !isset( $item['class'] ) ) {
+				$item['class'] = '';
+			}
 			$item['class'] = rtrim( 'collapsible ' . $item['class'], ' ' );
 		}