fix crash on form validation process
Merge tag '2.5.2'