Fix SVACE issues - NULL_AFTER_DEREF