Removed looking up error by id (less assumptions)