--- Repository.pm.dist	2012-05-18 14:21:24.000000000 +0100
+++ Repository.pm	2016-11-22 11:22:29.675714933 +0000
@@ -382,5 +382,8 @@
 	{
 		my $value = ( $self->{query}->param( $name ) );
-		utf8::decode($value);
+		if( EPrints::Utils::is_set( $value ) )
+		{
+			utf8::decode($value);
+		}
 		return $value;
 	}
@@ -398,5 +401,9 @@
 	}
 
-	utf8::decode($_) for @result;
+	for( @result )
+	{
+		next if( !EPrints::Utils::is_set( $_ ) );
+		utf8::decode($_);
+	} 
 
 	return( @result );