Better error codes

+1