Improve error handling during audit trailing WIP

To me it is similar to this case: 
https://github.com/oscaro/oshop/pull/972/files#diff-84287228496cd6ae77f5990ce46448bfR69
Can you explain the difference ?