[#2141] Use optionals for return values that may be null to enforce a client check

[#2141] Use optionals for return values that may be null to enforce a client check #3157