[improve_error_message] Done