ACCUMULO-2910 Remove unnecessary null conditional check. Add null-check on setter.