diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index bca4238c11..0cd0907fa3 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -746,7 +746,8 @@ bool wxDataViewRendererBase::FinishEditing()
         return true;
 
     wxVariant value;
-    GetValueFromEditorCtrl( m_editorCtrl, value );
+    if ( !GetValueFromEditorCtrl(m_editorCtrl, value) )
+        return false;
 
     wxDataViewCtrl* dv_ctrl = GetOwner()->GetOwner();