diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index f72ebe55..6a0faa1c 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -3329,23 +3329,12 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 		XmlPullUtil.enter(pp, "itdRequest");
 
-		if (XmlPullUtil.test(pp, "clientHeaderLines"))
-			XmlPullUtil.next(pp);
-
-		if (XmlPullUtil.test(pp, "itdMessageList"))
-			XmlPullUtil.next(pp);
-
-		if (XmlPullUtil.test(pp, "itdVersionInfo"))
-			XmlPullUtil.next(pp);
-
-		if (XmlPullUtil.test(pp, "itdLayoutParams"))
-			XmlPullUtil.next(pp);
-
-		if (XmlPullUtil.test(pp, "itdInfoLinkList"))
-			XmlPullUtil.next(pp);
-
-		if (XmlPullUtil.test(pp, "serverMetaInfo"))
-			XmlPullUtil.next(pp);
+		XmlPullUtil.optSkip(pp, "itdMessageList");
+		XmlPullUtil.optSkip(pp, "clientHeaderLines");
+		XmlPullUtil.optSkip(pp, "itdVersionInfo");
+		XmlPullUtil.optSkip(pp, "itdLayoutParams");
+		XmlPullUtil.optSkip(pp, "itdInfoLinkList");
+		XmlPullUtil.optSkip(pp, "serverMetaInfo");
 
 		return header;
 	}