Fixed MaxRetries errors (bug 816122)