Swaps ObjectNotFoundException for Optional<?>