Better handling when there are no registrations