You should combine this block with the check on line 927.