Minor cleanup, remove redundant error check.