Fixed "reached end of non void..." warnings.