Added missing return statements.