Merge "Fix the svace issue (DEREF_OF_NULL)" into tizen