Fix deregister to continue when things are missing