minor update to returning boost::optional value.