#101 Use of Optional (or something similar) instead of null

[Matthew Horridge]

See the guava documentation. Basically, avoid returning null values. Instead, use something like Optional from guava.