Revert "Revert error wrapping"
Revert "Revert error wrapping"

This reverts commit f75f5a3a9080d25ed04690f49d53d6109bacda4d.

bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop