FIxed destructor being called on nulls