Merge "Need to check empty not null for String"