Fix bug with waypoints code throwing error during chat removal

:rainbow: :rainbow: