[PATCH] Fix error_messages deprecations