Fixed missing return statements.