Manage unregistered better