ToolForm: Update error handling