Avoid badarith error during cluster upgrade

BugzID: 26631