Feature #2368 - form helpers, exceptions and fixes