--- orig-SlimServer_6.5_v2007-04-27/Slim/Utils/Text.pm	2007-03-28 10:09:13.000000000 +0200
+++ SlimServer_6.5_v2007-04-27/Slim/Utils/Text.pm	2007-04-27 11:52:11.000000000 +0200
@@ -35,7 +35,8 @@
 =cut
 
 sub ignorePunct {
-	my $s = shift || return undef;
+	my $s = shift;
+	return undef unless defined $s;
 
 	my $orig = $s;
 
@@ -58,8 +59,9 @@
 =cut
 
 sub matchCase {
-	my $s = shift || return undef;
-
+	my $s = shift;
+        return undef unless defined $s;
+	
 	# Upper case and fold latin1 diacritical characters into their plain versions, surprisingly useful.
 	$s =~ tr{abcdefghijklmnopqrstuvwxyzÀÁÂÃÄÅßÞÇ¢ÐÈÉÊËÌÍÎÏÑÒÓÔÕÖØÙÚÛÜ×Ýàáâãäåþçèéêëìíîïñòóôõöøùúûüÿýð¡°}
 		{ABCDEFGHIJKLMNOPQRSTUVWXYZAAAAAABBCCDEEEEIIIINOOOOOOUUUUXYAAAAAABCEEEEIIIINOOOOOOUUUUYYD!D};
@@ -86,7 +88,8 @@
 =cut
 
 sub ignoreArticles {
-	my $item = shift || return;
+	my $item = shift;
+	return undef unless defined $item;
 
 	if (!defined($ignoredArticles)) {
 
@@ -112,7 +115,8 @@
 =cut
 
 sub ignoreCaseArticles {
-	my $s = shift || return undef;
+	my $s = shift;
+	return undef unless defined $s;
 
 	# We don't handle references of any kind.
 	if (ref($s)) {