added try/catch and finding of single Entity