Clear form on cancel and better error messages