Remove excessive nil check