Re #10803 Fixing error which has been already fixed

(and changes to wrapper decorators, allowing nice error reporting)
Merge branch 'feature/10803_DirectInelasticPack' into develop