findoneorexception improvement