fix(error): wrap and re-throw errors

fix(error): wrap and re-throw errors #502