Form error mapping updates

* Added global form errors
* added 2.5 compatibility