Better error codes

One error per file please