I would vote to combine this test and the one following it. Just pull line 44 into this block.