I am fine with returning the Option as such as well - if that is more scala friendly.
Re: Java - did not commit file, will push.