Changed error return values.