diff --git a/src/Wima/WaypointManager/DefaultManager.cpp b/src/Wima/WaypointManager/DefaultManager.cpp
index 07d3632d091ee58e0bb7705308e03bdfe581a840..fbdadf1a32ccc0c33c5e41ede821afbeeeb9138e 100644
--- a/src/Wima/WaypointManager/DefaultManager.cpp
+++ b/src/Wima/WaypointManager/DefaultManager.cpp
@@ -136,7 +136,6 @@ bool WaypointManager::DefaultManager::_worker()
         return false;
     }
     if ( !_calcShortestPath(_settings->homePosition(), _currentWaypoints.first(), arrivalPath) ) {
-        Q_ASSERT(false);
         qWarning("WaypointManager::DefaultManager::next(): Not able to calc path from home position to first waypoint.");
         return false;
     }
@@ -148,11 +147,10 @@ bool WaypointManager::DefaultManager::_worker()
     qDebug() << "_currentWaypoints.last(): " << _currentWaypoints.last();
     qDebug() << "_settings->homePosition(): " << _settings->homePosition();
     QVector<QGeoCoordinate> returnPath;
-    //if ( !_calcShortestPath(_currentWaypoints.last(), _settings->homePosition(), returnPath) ) {
-    if ( !_calcShortestPath(_settings->homePosition(), _currentWaypoints.first(), returnPath) ) {
-        Q_ASSERT(false);
+    if ( !_calcShortestPath(_currentWaypoints.last(), _settings->homePosition(), returnPath) ) {
+    //if ( !_calcShortestPath(_settings->homePosition(), _currentWaypoints.first(), returnPath) ) {
         qWarning("WaypointManager::DefaultManager::next(): Not able to calc path from home position to last waypoint.");
-        //return false;
+        return false;
     }
     returnPath.removeFirst();
     returnPath.removeLast();