diff --git a/src/BusProNet/ResponseParser.php b/src/BusProNet/ResponseParser.php
index dd88ebb..ed510c3 100644
--- a/src/BusProNet/ResponseParser.php
+++ b/src/BusProNet/ResponseParser.php
@@ -221,8 +221,8 @@ class ResponseParser
                 ->setId($id)
                 ->setBusProId($busProId)
                 ->setCode((string) $item->attributes()['code'])
-                ->setCity((string) $item->xpath('ort')[0])
-                ->setStreet((string) $item->xpath('strasse')[0])
+                ->setCity($item->xpath('ort') ? (string) $item->xpath('ort')[0] : null)
+                ->setStreet($item->xpath('strasse') ? (string) $item->xpath('strasse')[0] : '')
             ;
             $pickups[$busProId] = $pickup;
         }