Proper localization of errors (probably more to come)