CRM-13807 - Add comments and null test