Remove entitynotfoundexception