Fixed: not all control paths returned value...