Merge "Check return value for error" into tizen