Clean up constructor
Exception cleanup