Feature/23 error string return