Fix the svace issue - NULL_AFTER_DEREF