nit: The `@return` docs are bad; particularly for methods that just return something. You're better off describing the special case for null in the opening sentence of this doc.

http://publicobject.com/2008/02/java-minutiae-return.html