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