diff --git a/bin/hafas-m b/bin/hafas-m
index b0334931371c428b91882d0c99dae87b4252d075..5c81c557f92cfdc4f3de70f209b865240500fa0a 100755
--- a/bin/hafas-m
+++ b/bin/hafas-m
@@ -658,11 +658,11 @@ if ($offset_len) {
 
 for my $m ( $status->messages ) {
 	if ( $m->ref_count > 0 and $m->{show} ) {
-		if ( $m->short ) {
+		if ( $m->short and $m->text ) {
 			printf( "\n# (%d) %s\n# %s\n", $m->{id}, $m->short, $m->text );
 		}
-		else {
-			printf( "\n# (%d) %s\n", $m->{id}, $m->text );
+		elsif ( $m->short or $m->text ) {
+			printf( "\n# (%d) %s\n", $m->{id}, $m->text || $m->short );
 		}
 	}
 }