Simplify error lookup
Use logger