BBC - fix up handling of optional return params