diff --git a/Blacklight/NameFixer.php b/Blacklight/NameFixer.php
index deb56fee2..6aba609e9 100755
--- a/Blacklight/NameFixer.php
+++ b/Blacklight/NameFixer.php
@@ -2300,6 +2300,6 @@ class NameFixer
     {
         $result = preg_match('/(\d{2}\.\d{2}\.\d{2})+[\w\-.]+[\w]$/i', $fileName, $match);
 
-        return [$result === 1, $match[0]];
+        return [$result === 1, $match[0] ?? ''];
     }
 }
diff --git a/Changelog b/Changelog
index b768a7ff5..44b1fba5b 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-10-16 DariusIII
+	* Fix: Fix preMatch function return values
 	* Chg: Update NameFixer and Utility classes
 	* Chg: Update phpunit/php-code-coverage to version 6.1.0
 2018-10-15 DariusIII