Issue #2296077 by mikeryan: Added exception handling around constructors