Updated NoSuchEntityException to provide original exception.
Update unit tests following by improvment of the code