Re #10803 Fixing error which has been already fixed

(and changes to wrapper decorators, allowing nice error reporting)