diff --git a/lib/Travel/Routing/DE/HAFAS.pm b/lib/Travel/Routing/DE/HAFAS.pm
index cce1c8e1863c430503baca551a7229a29f019ca1..692b48c4ecab1e5330548ce3136b1b13b384a60a 100644
--- a/lib/Travel/Routing/DE/HAFAS.pm
+++ b/lib/Travel/Routing/DE/HAFAS.pm
@@ -437,10 +437,10 @@ sub add_message {
 	for my $message ( @{ $self->{messages} } ) {
 		if (
 			(
-				not( not defined $code or not defined $message->{code} )
+				not( defined $code and defined $message->{code} )
 				or $code eq $message->{code}
 			)
-			and ( not( not defined $text or not defined $message->{text} )
+			and ( not( defined $text and defined $message->{text} )
 				or $text eq $message->{text} )
 		  )
 		{