Fix error reporting

It was using the old architecture