removing unnecessary test for nil