Merge pull request #1224 from Nicoshev/remove_redundant_code Remove redundant error check GitOrigin-RevId: a69683fe6395d96424fefb2ead71aebea1ca4b1f Change-Id: I85d949d063707b92ac456ecb90724db9e7fedc89