diff --git a/.htaccess b/.htaccess
index b7ee2318a7d2d..fb0ef973fcf15 100644
--- a/.htaccess
+++ b/.htaccess
@@ -103,3 +103,7 @@
 
 AddDefaultCharset utf-8
 Options -Indexes
+#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####
+
+ErrorDocument 403 /
+ErrorDocument 404 /
diff --git a/apps/theming/tests/IconBuilderTest.php b/apps/theming/tests/IconBuilderTest.php
index a365f653e4c43..f4ad5bef4ac71 100644
--- a/apps/theming/tests/IconBuilderTest.php
+++ b/apps/theming/tests/IconBuilderTest.php
@@ -186,7 +186,7 @@ public function testGetFavicon($app, $color, $file) {
 
 	public function testGetFaviconNotFound() {
 		$this->checkImagick();
-		$this->expectException(Warning::class);
+		$this->expectWarning(Warning::class);
 		$util = $this->getMockBuilder(Util::class)->disableOriginalConstructor()->getMock();
 		$iconBuilder = new IconBuilder($this->themingDefaults, $util, $this->imageManager);
 		$this->imageManager->expects($this->once())
@@ -200,7 +200,7 @@ public function testGetFaviconNotFound() {
 
 	public function testGetTouchIconNotFound() {
 		$this->checkImagick();
-		$this->expectException(Warning::class);
+		$this->expectWarning(Warning::class);
 		$util = $this->getMockBuilder(Util::class)->disableOriginalConstructor()->getMock();
 		$iconBuilder = new IconBuilder($this->themingDefaults, $util, $this->imageManager);
 		$util->expects($this->once())
@@ -211,7 +211,7 @@ public function testGetTouchIconNotFound() {
 
 	public function testColorSvgNotFound() {
 		$this->checkImagick();
-		$this->expectException(Warning::class);
+		$this->expectWarning(Warning::class);
 		$util = $this->getMockBuilder(Util::class)->disableOriginalConstructor()->getMock();
 		$iconBuilder = new IconBuilder($this->themingDefaults, $util, $this->imageManager);
 		$util->expects($this->once())