fixed missing error message and fixed the in-form back button