CROWDCON-6 reworked error controller some more