Fixed missing return values.