Emit a real error instead of a string
Cleaning up