one more null check with Optional

Instead of

    if (tipDocument.isPresent()) {
      return tipDocument.get();
    }
    return null;

use

return tipDocument.orNull();