AIA-56 still duped, changed from checking for null to checking isEmpty()