Merge "Fix svace issue (add null checker)" into tizen