diff --git a/src/uas/UASWaypointManager.cc b/src/uas/UASWaypointManager.cc
index d1761bd3b093817d805cf63aedc4a1909b200d18..f7e59bf5979943d49f7a1f0a445a120aa89e4808 100644
--- a/src/uas/UASWaypointManager.cc
+++ b/src/uas/UASWaypointManager.cc
@@ -600,22 +600,26 @@ void UASWaypointManager::sendWaypointRequest(quint16 seq)
 void UASWaypointManager::sendWaypoint(quint16 seq)
 {
     mavlink_message_t message;
+    qDebug() <<" WP Buffer count: "<<waypoint_buffer.count();
 
     if (seq < waypoint_buffer.count())
     {
+
         mavlink_waypoint_t *wp;
 
+
         wp = waypoint_buffer.at(seq);
         wp->target_system = uas.getUASID();
         wp->target_component = MAV_COMP_ID_WAYPOINTPLANNER;
 
         emit updateStatusString(QString("sending waypoint ID %1 of %2 total").arg(wp->seq).arg(current_count));
 
+        qDebug() << "sent waypoint (" << wp->seq << ") to ID " << wp->target_system<<" WP Buffer count: "<<waypoint_buffer.count();
+
         mavlink_msg_waypoint_encode(uas.mavlink->getSystemId(), uas.mavlink->getComponentId(), &message, wp);
         uas.sendMessage(message);
         MG::SLEEP::usleep(PROTOCOL_DELAY_MS * 1000);
 
-        qDebug() << "sent waypoint (" << wp->seq << ") to ID " << wp->target_system;
     }
 }