Add Optional.absent in place of null