added exceptions if entity not found
inherited some docs