Feature/pn 327 improve handling of validation errors

@hedleyroos please review as part of https://praekelt.atlassian.net/browse/PN-327