diff --git a/src/rviz/default_plugin/marker_utils.cpp b/src/rviz/default_plugin/marker_utils.cpp
index ba4f7a173f..9508dc87fb 100644
--- a/src/rviz/default_plugin/marker_utils.cpp
+++ b/src/rviz/default_plugin/marker_utils.cpp
@@ -224,7 +224,10 @@ void checkPointsArrow(const visualization_msgs::Marker& marker, std::stringstrea
     addSeparatorIfRequired(ss);
     ss << "Number of points for an ARROW marker should be either 0 or 2.";
     increaseLevel(::ros::console::levels::Error, level);
+    return;
   }
+  for (const auto& p : marker.points)
+    checkFloats(p, ss, level);
 }
 
 void checkPointsNotEmpty(const visualization_msgs::Marker& marker, std::stringstream& ss, ::ros::console::levels::Level& level)