Merge "add to check return value and delete incorrectly code" into tizen_2.2