DDatabase throws EntityNotFoundException

I am using TxReport instances and retrieving the "before"entity, which does not always exist.
Having to handle exceptions makes the code rather ugly. 

Throwing exceptions is generally considered non-idiomatic.

Can the API be changed to return Option?