With the new filter, this allows to stop it without throwing errors.
Bringing order to the mess, one commit at a time.