diff --git a/evrouting/gasstation/routing.py b/evrouting/gasstation/routing.py
index 4849b2f5cff5336f585c783f035343115f01ac5c..c40aa1cec05c16b15b369a430e47204e9badc13d 100644
--- a/evrouting/gasstation/routing.py
+++ b/evrouting/gasstation/routing.py
@@ -195,6 +195,16 @@ def shortest_path(G: nx.Graph, charging_stations: Set[Node], s: Node, t: Node,
     :param U: Capacity
     :return:
     """
+    # Check if t is reachable from s
+    # Todo: Test!
+    _path = dijkstra(G, s, t, weight=CONSUMPTION_KEY)
+    _w = fold_path(G, _path, weight=CONSUMPTION_KEY)
+    if _w < initial_soc:
+        return {
+            'trip_time': fold_path(G, _path, weight=DISTANCE_KEY),
+            'path': [(s, 0), (t, 0)]
+        }
+
     contracted_graph: nx.Graph = contract_graph(G, charging_stations, capacity)
     extended_graph = state_graph(contracted_graph, capacity)