diff --git a/src/MissionManager/QGCMapPolygon.cc b/src/MissionManager/QGCMapPolygon.cc
index 804ab69637771b8945cba4fc7b07fc33017a853d..7c6afd4516b88697885266e14291b31ebc9f8a94 100644
--- a/src/MissionManager/QGCMapPolygon.cc
+++ b/src/MissionManager/QGCMapPolygon.cc
@@ -13,6 +13,7 @@
 #include "QGCQGeoCoordinate.h"
 #include "QGCApplication.h"
 #include "ShapeFileHelper.h"
+#include "QGCLoggingCategory.h"
 
 #include <QGeoRectangle>
 #include <QDebug>
@@ -635,7 +636,11 @@ void QGCMapPolygon::selectVertex(int index)
     if(-1 <= index && index < count()) {
         _selectedVertexIndex = index;
     } else {
-        qWarning() << "QGCMapPolygon: Selected vertex index is out of bounds!";
+        if (!qgcApp()->runningUnitTests()) {
+            qCWarning(ParameterManagerLog)
+                    << QString("QGCMapPolygon: Selected vertex index (%1) is out of bounds! "
+                               "Polygon vertices indexes range is [%2..%3].").arg(index).arg(0).arg(count()-1);
+        }
         _selectedVertexIndex = -1;   // deselect vertex
     }
 
diff --git a/src/MissionManager/QGCMapPolyline.cc b/src/MissionManager/QGCMapPolyline.cc
index aec2a01c19c189de17dbf52482faae3943625a4b..3efdecc9eb1aef05c380bbeb7a385e5358fe1005 100644
--- a/src/MissionManager/QGCMapPolyline.cc
+++ b/src/MissionManager/QGCMapPolyline.cc
@@ -452,7 +452,11 @@ void QGCMapPolyline::selectVertex(int index)
     if(-1 <= index && index < count()) {
         _selectedVertexIndex = index;
     } else {
-        qWarning() << "QGCMapPolyline: Selected vertex index is out of bounds!";
+        if (!qgcApp()->runningUnitTests()) {
+            qCWarning(ParameterManagerLog)
+                    << QString("QGCMapPolyline: Selected vertex index (%1) is out of bounds! "
+                               "Polyline vertices indexes range is [%2..%3].").arg(index).arg(0).arg(count()-1);
+        }
         _selectedVertexIndex = -1;   // deselect vertex
     }