Merge "Add NULL check logic" into tizen