! Revamped error wrapping

Now it's more straightforward.