Feature/12 error strings