Addition of exceptions.
Cleanup of the constructor.