Merge "make scheduler client tolerance to error messages"