diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index 375528a9..1b099448 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -1424,8 +1424,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
             if (trainNum != null)
                 return new Line(id, network, Product.REGIONAL_TRAIN, Strings.nullToEmpty(trainType) + trainNum);
         } else if ("14".equals(mot) || "15".equals(mot) || "16".equals(mot)) {
-            if (trainType != null && trainNum != null)
-                return new Line(id, network, Product.HIGH_SPEED_TRAIN, trainType + trainNum);
+            if (trainType != null || trainNum != null)
+                return new Line(id, network, Product.HIGH_SPEED_TRAIN, Strings.nullToEmpty(trainType) + Strings.nullToEmpty(trainNum));
         } else if ("17".equals(mot)) {
             if (trainNum == null && trainName != null && trainName.startsWith("Schienenersatz"))
                 return new Line(id, network, Product.BUS, "SEV");