Swaps ObjectNotFoundException for Optional<?>

https://github.com/framon/calry/issues/2