more EntityErrorException work + tests