Updates for forms and exceptions handlings.
Bug fixing after many changes.