[PATCH 0/1] Fix error_messages deprecations rev.1