This seems unintended, or if it's intended shall we clarify the javadocs w.r.t. when null/non-null is returned?