Added multiple error messages and moved data mapper setup to helper