removed commented out code
nil check