diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index 776da5b5c6..579782467c 100644
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -1237,7 +1237,8 @@ void wxGDIPlusPathData::CloseSubpath()
     if( m_figureOpened )
     {
         // Ensure that sub-path being closed contains at least one point.
-        m_path->AddLine(m_logCurrentPoint, m_logCurrentPoint);
+        if ( m_logCurrentPointSet )
+            m_path->AddLine(m_logCurrentPoint, m_logCurrentPoint);
 
         m_path->CloseFigure();
         m_figureOpened = false;