CRM-13550 previous didn't deal with empty very well
Merge pull request #46 from eileenmcnaughton/CRM-13550

CRM-13550 previous didn't deal with empty very well