Updated error handling a bit.
Updated number.